diff --git a/README.md b/README.md index a713c6835..a4dd85b4f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ For a list of frequently asked questions please visit the [Copay FAQ](https://gi - Push notifications (only available for ios and android versions) - Customizable wallet naming and background colors - Multiple languages supported -- Available for [iOS](https://itunes.apple.com/us/app/copay/id951330296), [Android](https://play.google.com/store/apps/details?id=com.bitpay.copay&hl=en), [Windows Phone](http://www.windowsphone.com/en-us/store/app/copay-wallet/4372479b-a064-4d18-8bd3-74a3bdb81c3a), [Chrome App](https://chrome.google.com/webstore/detail/copay/cnidaodnidkbaplmghlelgikaiejfhja?hl=en), [Linux](https://github.com/bitpay/copay/releases/latest), [Windows](https://github.com/bitpay/copay/releases/latest) and [OS X](https://github.com/bitpay/copay/releases/latest) devices +- Available for [iOS](https://itunes.apple.com/us/app/copay/id951330296), [Android](https://play.google.com/store/apps/details?id=com.bitpay.copay&hl=en), [Windows Phone](https://www.microsoft.com/en-us/store/p/copay-secure-bitcoin-wallet/9nm8z2b0387b), + [Chrome App](https://chrome.google.com/webstore/detail/copay/cnidaodnidkbaplmghlelgikaiejfhja?hl=en), [Linux](https://github.com/bitpay/copay/releases/latest), [Windows](https://github.com/bitpay/copay/releases/latest) and [OS X](https://github.com/bitpay/copay/releases/latest) devices ## Testing in a Browser @@ -72,7 +73,7 @@ npm run start:android ### iOS -Follow the [Cordova iOS Platform Guide](https://cordova.apache.org/docs/en/latest/guide/platforms/android/) to set up your development environment. +Follow the [Cordova iOS Platform Guide](https://cordova.apache.org/docs/en/latest/guide/platforms/ios/) to set up your development environment. When your developement enviroment is ready, run the `start:ios` npm package script. @@ -81,6 +82,28 @@ npm run apply:copay npm run start:ios ``` +### Windows Phone + +Follow the [Cordova Windows Phone Platform Guide](https://cordova.apache.org/docs/en/latest/guide/platforms/win8/index.html) to set up your development environment. + +When your developement enviroment is ready, follow this instructions: + +- Go to app-template folder, search for config-template.xml and then remove this line: +```sh + +``` +and then enable this one: +```sh + +``` +- Run: +```sh +npm run clean-all +npm run apply:copay +npm run start:windows +``` +- Then open the project file with VS inside cordova/platform/windows/ + ### Desktop (Linux, macOS, and Windows) The desktop version of Copay currently uses NW.js, an app runtime based on Chromium. To get started, first install NW.js on your system from [the NW.js website](https://nwjs.io/). @@ -116,8 +139,22 @@ npm run final:ios ### Windows Phone -- Install Visual Studio 2013 (or newer) -- Run `make wp8-prod` +- Install Visual Studio 2015 (or newer) +- Go to app-template folder, search for config-template.xml and then remove this line: +```sh + +``` +and then enable this one: +```sh + +``` +- Run: +```sh +npm run clean-all +npm run apply:copay +npm run final:windows +``` +- Then open the project file with VS inside cordova/platform/windows/ ### Desktop (Linux, macOS, and Windows) diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index e76151b7e..e1053b065 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -2,6 +2,7 @@ "packageName": "bitpay", "packageDescription": "Secure Bitcoin Wallet", "packageNameId": "com.bitpay.wallet", + "statusBarColor": "#1e3186", "userVisibleName": "BitPay", "purposeLine": "Secure Bitcoin Wallet", "bundleName": "wallet", @@ -22,8 +23,8 @@ "windowsAppId": "2d1002d7-ee34-4f60-bd29-0c871ba0c195", "pushSenderId": "1036948132229", "description": "Secure Bitcoin Wallet", - "version": "3.6.3", - "androidVersion": "363000", + "version": "3.7.1", + "androidVersion": "371000", "_extraCSS": null, "_enabledExtensions": { "coinbase": true, diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json index 5f685382b..c36e4cbcc 100644 --- a/app-template/copay/appConfig.json +++ b/app-template/copay/appConfig.json @@ -2,6 +2,7 @@ "packageName": "copay", "packageDescription": "Copay Bitcoin Wallet", "packageNameId": "com.bitpay.copay", + "statusBarColor": "#192c3a", "userVisibleName": "Copay", "purposeLine": "Copay Bitcoin Wallet", "bundleName": "copay", @@ -22,8 +23,8 @@ "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c", "pushSenderId": "1036948132229", "description": "A Secure Bitcoin Wallet", - "version": "3.6.3", - "androidVersion": "363000", + "version": "3.7.1", + "androidVersion": "371000", "_extraCSS": null, "_enabledExtensions": { "coinbase": true, diff --git a/i18n/po/de.po b/i18n/po/de.po index ef038ec04..dddbd89c1 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: German\n" "Language: de\n" -"PO-Revision-Date: 2017-06-29 07:15-0400\n" +"PO-Revision-Date: 2017-07-18 13:18-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -28,7 +28,7 @@ msgstr "* Ein Zahlungsvorschlag kann gelöscht werden, wenn 1) Du diesen erzeugt #: www/views/tx-details.html:84 msgid "- {{btx.feeRateStr}} of the transaction" -msgstr "" +msgstr "- {{btx.feeRateStr}}ของธุรกรรม" #: www/views/modals/txp-details.html:104 msgid "- {{tx.feeRateStr}} of the transaction" @@ -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:347 +#: src/js/controllers/confirm.js:351 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:341 +#: src/js/controllers/confirm.js:345 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." @@ -56,8 +56,8 @@ msgstr "Insgesamt wurden {{amountBelowFeeStr}} ausgeschlossen. Diese Gelder stam msgid "About" msgstr "Über" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "Akzeptiert" @@ -117,7 +117,11 @@ 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:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "Beschreibung hinzufügen" @@ -136,7 +140,6 @@ msgstr "Wallet hinzufügen" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "Adresse" @@ -194,10 +197,13 @@ msgstr "Fast fertig! Fassen wir zusammen." msgid "Alternative Currency" msgstr "Alternative Währung" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "Betrag" @@ -205,7 +211,7 @@ msgstr "Betrag" msgid "Amount below minimum allowed" msgstr "Betrag unter zulässigem Minimum" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "Betrag zu hoch" @@ -245,11 +251,11 @@ msgstr "" msgid "Are you sure you want to delete this wallet?" msgstr "Soll das Wallet wirklich gelöscht werden?" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "Wollen Sie wirklich diese Transaktion ablehnen?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "Wollen Sie wirklich diese Transaktion löschen?" @@ -278,7 +284,7 @@ msgstr "Verfügbar" msgid "Available Balance" msgstr "Verfügbarer Gesamtbetrag" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "Durchschnittliche Bestätigungzeit" @@ -290,7 +296,7 @@ msgstr "Durchschnittliche Bestätigungzeit" msgid "BIP32 path for address derivation" msgstr "BIP32 Pfad für die Adressen-Ableitung" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "Sicherung" @@ -302,7 +308,7 @@ msgstr "Backup wird benötigt" msgid "Backup all livenet wallets before using this function" msgstr "Sichern Sie alle Livenet Wallets, bevor Sie diese Funktion nutzen" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "Backup benötigt" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "BitPay Visa® Karten" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "Bitcoin-Adresse" @@ -346,10 +353,6 @@ msgstr "Bitcoin-Adresse" msgid "Bitcoin Network Fee Policy" msgstr "Bitcoin-Netzwerk Gebührenübersicht" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "Bitcoin URI ist NICHT gültig!" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Bitcoin-Einheit" @@ -370,12 +373,16 @@ msgstr "Bitcoin ist sicheres,
digitales Geld." msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "Bitcoin Transaktionen enthalten eine Gebühr für die \"Miners\" im Netzwerk." +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "Zahlung übermitteln" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "Gesendet" @@ -387,7 +394,11 @@ msgstr "Übermittlung der Transaktion" msgid "Browser unsupported" msgstr "Browser wird nicht unterstützt" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "Kaufe & Verkaufe Bitcoins" @@ -395,6 +406,10 @@ msgstr "Kaufe & Verkaufe Bitcoins" msgid "Buy Bitcoin" msgstr "Kaufe Bitcoins" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "Kaufe Bitcoins..." @@ -403,18 +418,24 @@ msgstr "Kaufe Bitcoins..." msgid "Calculating fee" msgstr "Mining-Fee Berechnung" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "Abbruch" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "" @@ -426,7 +447,7 @@ msgstr "Wallet kann nicht erstellt werden" msgid "Cannot join the same wallet more that once" msgstr "An einem Wallet kann nicht mehrfach teilgenommen werden" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "Karten" @@ -458,12 +479,13 @@ msgstr "Leeren" msgid "Clear cache" msgstr "Cache leeren" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "Klick" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,7 +500,7 @@ msgstr "Farbe" msgid "Commit hash" msgstr "Hash übertragen" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "Beenden Sie den Backupvorgang um diese Option zu nutzen" @@ -486,9 +508,10 @@ msgstr "Beenden Sie den Backupvorgang um diese Option zu nutzen" msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "Bestätigen" msgid "Confirm & Finish" msgstr "Bestätigen & Beenden" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "PIN bestätigen" @@ -576,6 +603,9 @@ msgstr "In die Zwischenablage kopiert" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Diesen Text an einem sichern Ort einfügen (Notepad oder E-Mail)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "In die Zwischenablage kopieren" msgid "Could not access the wallet at the server. Please check:" msgstr "Kein Zugriff auf Wallet des Servers. Überprüfen Sie bitte:" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "Auf Wallet konnte nicht zugegriffen werden" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 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" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "Zahlung konnte nicht gesendet werden" @@ -605,11 +639,12 @@ msgstr "Transaktion konnte nicht erstellt werden" msgid "Could not create address" msgstr "Adresse konnte nicht erstellt werden" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "" @@ -629,23 +664,28 @@ msgstr "Wallet-Wiederherstellungsphrase nicht gültig" msgid "Could not decrypt file, check your password" msgstr "Datei konnte nicht entschlüsselt werden, bitte das Passwort überprüfen" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "Zahlungsvorschlag konnte nicht gelöscht werden" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "Dynamische Gebühr konnten nicht abgerufen werden" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 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 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "Transaktionen konnten nicht gefunden werden" @@ -663,7 +703,7 @@ msgstr "Import nicht möglich. Bitte Datei und Berechtigungscode überprüfen" msgid "Could not join wallet" msgstr "Beteiligung am Wallet nicht möglich" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "Zahlung konnte nicht abgelehnt werden" @@ -680,11 +720,12 @@ msgstr "Karte konnte nicht gelöscht werden" msgid "Could not save preferences on the server" msgstr "Die Einstellungen konnten nicht am Server gespeichert werden" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "Zahlung kann nicht gesendet werden" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "" @@ -738,15 +779,23 @@ msgstr "Wallet erstellen..." msgid "Creating transaction" msgstr "Transaktion erstellen" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "Aktuelle Gebühr für dieses Verfahren" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "Benutzerdefinierter Betrag" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "Zahlungsvorschlag löschen" msgid "Delete Wallet" msgstr "Wallet löschen" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "Löschen und neues Wallet erzeugen" @@ -788,6 +837,7 @@ msgstr "Ableitungsstruktur" msgid "Derivation Strategy" msgstr "Ableitungstrategie" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" msgstr "" @@ -832,7 +882,7 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "E-Mail Adresse" @@ -844,7 +894,7 @@ msgstr "Obergrenze für leere Adressen erreicht. Neue Adressen können nicht gen msgid "Enable camera access in your device settings to get started." msgstr "Aktiviere den Kamerazugriff in Ihren Geräteeinstellungen." -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "Aktiviere E-Mail Benachrichtigung" @@ -869,6 +919,10 @@ msgstr "Berechtigungscode eingeben" msgid "Enter Two Factor for your BitPay account" msgstr "Eingabe des Zwei-Faktor-Authentifizierungs-Codes für das BitPay Konto" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Neuen Berechtigungscode eingeben" @@ -893,10 +947,12 @@ msgstr "Passwort eingeben" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "Passwort eingeben" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,26 +1005,35 @@ msgstr "Passwort eingeben" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Fehler" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "Fehler beim bestätigen" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "Fehler beim Erstellen des Wallets" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "" @@ -991,7 +1057,7 @@ 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:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,8 +1091,8 @@ msgid "Extended Public Keys" msgstr "Erweiterte öffentliche Schlüssel" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." -msgstr "Entpacke Wallet..." +msgid "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1045,6 +1111,14 @@ msgstr "Familienurlaub" msgid "Fee" msgstr "Gebühr" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1059,8 +1133,8 @@ msgid "Fetching BitPay Account..." msgstr "BitPay Konto abrufen..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" -msgstr "Zahlungsinformationen abrufen" +msgid "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 @@ -1082,6 +1156,8 @@ msgstr "Beenden" msgid "For audit purposes" msgstr "Zur Kontrolle" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1158,14 +1234,26 @@ msgstr "Starten Sie indem Sie ihr erstes hinzufügen." msgid "Getting fee levels..." msgstr "Entgelt-Level werden abgerufen..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "Zurück" @@ -1198,7 +1286,7 @@ msgstr "Hardware-Wallet" msgid "Help & Support" msgstr "Hilfe & Support" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: 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." @@ -1207,7 +1295,7 @@ msgstr "Hilfe und Support-Informationen gibt es auf der Website." msgid "Hide" msgstr "Verstecken" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "Guthaben Verstecken" @@ -1282,7 +1370,7 @@ msgstr "Ich verstehe, dass mein Geld auf diesem Gerät und nicht von einem Unter msgid "I've written it down" msgstr "Ich habe es aufgeschrieben" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "Wenn aktiviert, werden alle vertraulichen Informationen (private Schlüssel und Wiederherstellungs Satz) und die zugeordneten Aktionen (Ausgaben und Exporte) des Wallets geschützt." @@ -1355,12 +1443,14 @@ msgstr "QR code hat falsches Format" msgid "Incorrect network address" msgstr "" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "Nicht ausreichendes Guthaben" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Nicht ausreichendes Guthaben für die Gebühr" @@ -1369,7 +1459,8 @@ msgstr "Nicht ausreichendes Guthaben für die Gebühr" msgid "Invalid" msgstr "Ungültig" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "" @@ -1397,6 +1488,7 @@ msgstr "Ungültige Ableitungsstruktur" msgid "Invitation to share a {{appName}} Wallet" msgstr "Einladung um eine {{appName}} Wallet zu teilen" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "" @@ -1504,10 +1596,6 @@ msgstr "" msgid "Low fees" msgstr "Niedrige Gebühren" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "Sende eine Zahlung an" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "Macht Sinn" @@ -1525,7 +1613,7 @@ msgstr "Ich" msgid "Meh - it's alright" msgstr "Meh - ist in Ordnung" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "Notiz" msgid "Merchant Message" msgstr "Händlernachricht" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "Nachricht" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "Angabe fehlt" @@ -1548,7 +1632,7 @@ msgstr "Angabe fehlt" msgid "Missing private keys to sign" msgstr "Zum Signieren fehlen die privaten Schlüssel" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "Weitere Optionen" @@ -1558,7 +1642,7 @@ msgstr "Weitere Optionen" msgid "Moved" msgstr "Verschoben" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "Guthaben verschoben" @@ -1577,10 +1661,7 @@ msgstr "Hinweis: Um eine Brieftasche aus einer 3rd-Party-Software zu importieren msgid "Name" msgstr "Name" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "Netzwerk" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" msgstr "" @@ -1609,6 +1690,10 @@ msgstr "Nächste Schritte" msgid "No Wallet" msgstr "Keine Wallet" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "Keine Sicherung, keine Bitcoins." @@ -1625,7 +1710,7 @@ msgstr "Keine Hardwareinformationen verfügbar." msgid "No hardware wallets supported on this device" msgstr "Hardware-Wallets werden auf diesem Gerät nicht unterstützt" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "Keine ausstehenden Vorschläge" @@ -1633,7 +1718,8 @@ msgstr "Keine ausstehenden Vorschläge" msgid "No recent transactions" msgstr "Keine aktuellen Transaktionen" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "" @@ -1649,7 +1735,9 @@ msgstr "Kein Wallet gefunden" msgid "No wallet selected" msgstr "Kein Wallet ausgewählt" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" msgstr "" @@ -1665,7 +1753,7 @@ msgstr "Normal" msgid "Not authorized" msgstr "Nicht berechtigt" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "Das Guthaben reicht nicht für die Gebühr" @@ -1699,10 +1787,14 @@ msgstr "Benachrichtigungen" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "Jetzt ist ein guter Zeitpunkt um Ihre Wallet zu sichern. Wenn das Gerät verloren geht ist es unmöglich ohne eine Sicherung auf Ihr Geld zuzugreifen." @@ -1711,9 +1803,13 @@ 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/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "OK" @@ -1736,7 +1832,7 @@ msgstr "Oh nein!" 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:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Öffnen" @@ -1753,8 +1849,8 @@ msgstr "Öffne GitHub" msgid "Open GitHub Project" msgstr "Öffne GitHub Projekt" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Öffne Insight" @@ -1774,6 +1870,10 @@ msgstr "Öffne Website" msgid "Open wallet" msgstr "Öffne Wallet" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "BitPay-Karte bestellen" @@ -1809,6 +1909,7 @@ msgstr "Zahle 0 % Gebühren um Bitcoins in Dollar zu wechseln." msgid "Pay To" msgstr "Zahle an" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "Zahlung angenommen" @@ -1846,9 +1947,9 @@ msgstr "Zahlung erhalten" msgid "Payment Rejected" msgstr "Zahlung abgelehnt" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Zahlung gesendet" @@ -1869,7 +1970,7 @@ msgstr "Zahlungsdetails" msgid "Payment request" msgstr "Zahlungsanforderung" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "Anstehende Vorschläge" @@ -1930,7 +2031,7 @@ msgstr "Adressen werden vorbereitet..." msgid "Preparing backup..." msgstr "Sicherung wird vorbereitet..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "Zum Beenden erneut drücken" @@ -1938,6 +2039,10 @@ msgstr "Zum Beenden erneut drücken" msgid "Priority" msgstr "höchste Priorität" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "Privater Schlüssel verschlüsselt. Passwort eingeben" @@ -1950,8 +2055,8 @@ msgstr "Der private Schlüssel ist verschlüsselt, signieren ist nicht möglich" msgid "Proposal Accepted" msgstr "Vorschlag angenommen" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Vorschlag erstellt" @@ -1968,6 +2073,10 @@ msgstr "Vorschlag abgelehnt" msgid "Proposals" msgstr "Vorschläge" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "Push-Benachrichtigungen" @@ -2006,12 +2115,16 @@ msgstr "Mehr anzeigen" msgid "Receive" msgstr "Empfangen" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "Empfangen" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "Erhaltener Betrag" @@ -2056,8 +2169,8 @@ msgstr "Wiederherstellen" msgid "Recreating Wallet..." msgstr "Wallet wiederherstellen..." -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "Abgelehnt" @@ -2099,7 +2212,7 @@ msgstr "Passwort wiederholen" msgid "Repeat the password" msgstr "Passwort wiederholen" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "Fingerabdruck anfordern" @@ -2107,7 +2220,7 @@ msgstr "Fingerabdruck anfordern" msgid "Request Specific amount" msgstr "Einen bestimmten Betrag anfordern" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "Berechtigungscode abfragen" @@ -2135,7 +2248,7 @@ msgstr "Kamera nochmals versuchen" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "Speichern" @@ -2184,7 +2297,7 @@ msgstr "Transaktionen durchsuchen" msgid "Search your currency" msgstr "Suchen Sie Ihre Währung" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "Sicherheit" @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "Eine Sicherungsdatei auswählen" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "Wallet wählen" @@ -2230,7 +2342,7 @@ msgstr "Adressen per e-Mail versenden" msgid "Send by email" msgstr "Per E-Mail versenden" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "Senden von" @@ -2238,6 +2350,10 @@ msgstr "Senden von" msgid "Send max amount" msgstr "Sende max. Betrag" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "Senden Sie uns Feedback stattdessen" @@ -2265,7 +2381,7 @@ msgstr "Sende maximalen Betrag" msgid "Sending transaction" msgstr "Sende Transaktion" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Sende {{amountStr}} aus Ihrer Wallet {{name}}" @@ -2276,7 +2392,7 @@ msgstr "Sende {{amountStr}} aus Ihrer Wallet {{name}}" msgid "Sent" msgstr "Gesendet" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "Guthaben senden" @@ -2284,6 +2400,10 @@ msgstr "Guthaben senden" msgid "Server response could not be verified" msgstr "Antwort des Servers konnte nicht verifiziert werden" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "Services" @@ -2300,6 +2420,10 @@ msgstr "Sitzungsprotokoll" msgid "Set up a password" msgstr "Passwort einrichten" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "Einstellungen" msgid "Share the love by inviting your friends." msgstr "Teilen Sie die Liebe indem Sie Ihre Freunde einladen." -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "Einladung mit Copayern teilen" @@ -2371,10 +2495,14 @@ msgstr "Wallet mit einer einzigen Adresse" msgid "Skip" msgstr "Überspringen" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "Schieben" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2400,10 +2528,6 @@ msgstr "" msgid "Start sending bitcoin" msgstr "Starte mit dem Senden der Bitcoins" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "Wird gestartet..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "Sperre des Startups" @@ -2420,6 +2544,7 @@ msgstr "Niedrigste Priorität" msgid "Sweep" msgstr "Leeren" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Paperwallet löschen" @@ -2462,6 +2587,10 @@ msgstr "Nutzungsbedingungen" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2556,10 +2685,6 @@ msgstr "Die Transaktionshistorie und jede neue eingehende Transaktion werden in msgid "The wallet service URL" msgstr "Die URL des Wallet-Diensts" -#: www/views/paymentUri.html:23 -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:38 msgid "There is a new version of {{appName}} available" msgstr "Es steht eine neue Version von {{appName}} zur Verfügung" @@ -2583,7 +2708,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:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "Diese Bitcoin Zahlungsaufforderung ist abgelaufen." @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). msgstr "Dieses Wallet ist nicht beim angegebenen Bitcore Wallet Service (BWS) registriert. Bitte aus den lokalen Informationen wiederherstellen" #: www/views/modals/txp-details.html:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "Zeitachse" @@ -2640,10 +2765,11 @@ msgstr "" msgid "Top up in progress..." msgstr "" -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "" msgid "Touch ID Failed" msgstr "Touch-ID gescheitert" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "Transaktion" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,11 +2809,8 @@ msgstr "Transaktionsverlauf" msgid "Transaction already broadcasted" msgstr "Transaktion wurde bereits übermittelt" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "Transaktion erstellt" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "" @@ -2691,7 +2818,7 @@ msgstr "" msgid "Transaction initiated" msgstr "" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "Transaktion ist zu diesem Zeitpunkt nicht verfügbar" @@ -2700,6 +2827,10 @@ msgstr "Transaktion ist zu diesem Zeitpunkt nicht verfügbar" msgid "Transaction not found" msgstr "Transaktion konnte nicht gefunden werden" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "" @@ -2748,7 +2879,7 @@ msgstr "Nicht genutzte Adressen Limit" msgid "Update Available" msgstr "Aktualisierung verfügbar" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "Aktualisiere anstehende Vorschläge. Bitte warten" @@ -2793,8 +2924,8 @@ msgstr "Alle Adressen anzeigen" msgid "View Terms of Service" msgstr "Nutzungsbedingungen anzeigen" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Transaktionen auf Insight anzeigen" @@ -2802,7 +2933,7 @@ msgstr "Transaktionen auf Insight anzeigen" msgid "View Update" msgstr "Aktualisierungen anzeigen" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "Auf blockchain anzeigen" @@ -2830,11 +2961,11 @@ msgstr "Warte auf Ledger..." msgid "Waiting for Trezor..." msgstr "Warte auf Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "Warte auf copayer" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "Warte..." @@ -2926,7 +3057,7 @@ msgstr "Wallet ist bereits in Copay" msgid "Wallet created" msgstr "Wallet erstellt" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "Wallet unvollständig oder defekt" @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "Wallets & Integrationen" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "Wir sind immer auf der Suche nach Möglichkeiten um {{appName}} zu verbe msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "Wir sind immer auf der Suche nach Möglichkeiten um {{appName}} zu verbessern. Wie können wir Ihr Erlebnis verbessern?" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "Wir sind immer auf der Suche nach Übersetzungs-Beiträge! Sie können Korrekturen vornehmen oder helfen diese App in Ihrer Muttersprache zur Verfügung stellen, durch den Beitritt unserer Community bei Crowdin." @@ -3093,11 +3228,15 @@ msgstr "Sie können auch mit andere Währungen wie US-Dollar, Euro oder Pfund ha msgid "You control your bitcoin." msgstr "Sie kontrollieren Ihre Bitcoins." +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "" -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "Sie erhalten E-Mail Benachrichtigungen über gesendete und empfangen Zahlungen aus Ihren Wallets." @@ -3113,6 +3252,10 @@ msgstr "Ihre Bitcoin-Wallet wurde gesichert!" msgid "Your bitcoin wallet is ready!" msgstr "Ihre Bitcoin-Wallet ist fertig!" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "Ihre Ideen, Feedback oder Kommentare" @@ -3130,6 +3273,14 @@ msgstr "Name des Teilnehmers" msgid "Your password" msgstr "Passwort" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 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." @@ -3167,25 +3318,29 @@ msgstr "name@beispiel.com" msgid "preparing..." msgstr "in Arbeit..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "zu akzeptieren" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "zu zahlen" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "zu senden" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "{{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:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} wird für Bitcoin-Netzwerkgebühren abgezogen werden." @@ -3197,7 +3352,7 @@ msgstr "" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} Transaktionen werden heruntergeladen" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-von-{{wallet.n}}" diff --git a/i18n/po/es.po b/i18n/po/es.po index 08dc79913..f7e3e8502 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Spanish\n" "Language: es\n" -"PO-Revision-Date: 2017-06-29 08:05-0400\n" +"PO-Revision-Date: 2017-07-18 14:37-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -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:347 +#: src/js/controllers/confirm.js:351 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:341 +#: src/js/controllers/confirm.js:345 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." @@ -56,8 +56,8 @@ msgstr "Se excluyeron un total de {{amountBelowFeeStr}}. Estos fondos provienen msgid "About" msgstr "Acerca de" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "Aceptado" @@ -117,7 +117,11 @@ 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:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "Agregar como Contacto" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "Añadir descripción" @@ -136,7 +140,6 @@ msgstr "Agregar billetera" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "Dirección" @@ -194,10 +197,13 @@ msgstr "¡Casi listo! Vamos a revisar." msgid "Alternative Currency" msgstr "Moneda Alternativa" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "Amazon.com no está disponible en este momento. Inténtalo de nuevo más tarde." + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "Importe" @@ -205,7 +211,7 @@ msgstr "Importe" msgid "Amount below minimum allowed" msgstr "Cantidad por debajo del mínimo permitido" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "Monto demasiado grande" @@ -245,11 +251,11 @@ msgstr "¿Está seguro de que desea eliminar este contacto?" msgid "Are you sure you want to delete this wallet?" msgstr "¿Estás seguro de borrar esta billetera?" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "¿Estás seguro de rechazar esta transacción?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "¿Estás seguro de eliminar esta transacción?" @@ -278,7 +284,7 @@ msgstr "Disponible" msgid "Available Balance" msgstr "Balance disponible" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "Tiempo promedio de confirmación" @@ -290,7 +296,7 @@ msgstr "Tiempo promedio de confirmación" msgid "BIP32 path for address derivation" msgstr "BIP32 para el camino de derivación de direcciones" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "Copia de seguridad" @@ -302,7 +308,7 @@ msgstr "Se necesita copia de seguridad" msgid "Backup all livenet wallets before using this function" msgstr "Debes respaldar todas tus billeteras para utilizar esta función" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "Necesita respaldar" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "Tarjetas BitPay Visa®" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "Dirección Bitcoin" @@ -346,10 +353,6 @@ msgstr "Dirección Bitcoin" msgid "Bitcoin Network Fee Policy" msgstr "Política de Comisión de la Red Bitcoin" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "¡Bitcoin URI no es válida!" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Unidad de Bitcoin" @@ -370,12 +373,16 @@ msgstr "Bitcoin es seguro,
dinero digital." msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "Las transacciones de bitcoins incluyen una comisión recogida por los mineros de la red." +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "Compró {{amountUnitStr}}" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "Enviar Pago" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "Enviado" @@ -387,7 +394,11 @@ msgstr "Finalizando transacción" msgid "Browser unsupported" msgstr "Navegador no soportado" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "Comprar" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "Comprar & Vender Bitcoin" @@ -395,6 +406,10 @@ msgstr "Comprar & Vender Bitcoin" msgid "Buy Bitcoin" msgstr "Comprar Bitcoin" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "Comprar desde" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "Comprando Bitcoins..." @@ -403,18 +418,24 @@ msgstr "Comprando Bitcoins..." msgid "Calculating fee" msgstr "Calculando comisión" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "Cancelar" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "Cancelar invitación" @@ -426,7 +447,7 @@ msgstr "No se pudo crear la billetera" msgid "Cannot join the same wallet more that once" msgstr "No puede unirse a la misma billetera más de una vez" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "Tarjetas" @@ -458,12 +479,13 @@ msgstr "Anular" msgid "Clear cache" msgstr "Limpiar cache" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "Click" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,7 +500,7 @@ msgstr "Color" msgid "Commit hash" msgstr "Commit hash" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "Completar el proceso de respaldo para usar esta opción" @@ -486,9 +508,10 @@ msgstr "Completar el proceso de respaldo para usar esta opción" msgid "Completed" msgstr "Terminadas" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "Confirmar" msgid "Confirm & Finish" msgstr "Confirmar y terminar" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "Confirmar compra" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "Confirma tu PIN" @@ -576,6 +603,9 @@ msgstr "Copiado al portapapeles" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Copiar el texto como está en un lugar seguro (bloc de notas o correo electrónico)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "Copiar al portapapeles" msgid "Could not access the wallet at the server. Please check:" msgstr "No se pudo acceder a la billetera desde el servidor. Por favor verificar:" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "No se pudo acceder a Amazon.com" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "No se pudo acceder a la billetera" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 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" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "No se pudo enviar el pago" @@ -605,11 +639,12 @@ msgstr "No se pudo construir la transacción" msgid "Could not create address" msgstr "No se pudo crear la dirección" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "No se pudo crear la factura" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "No se pudo crear la transacción" @@ -629,23 +664,28 @@ msgstr "No se pudo crear: frase de recuperación inválida" msgid "Could not decrypt file, check your password" msgstr "No se pudo descifrar el archivo, verifique su contraseña" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "No se pudo eliminar la propuesta de pago" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "No se pudo obtener comisión dinámica" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 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 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "No se pudieron obtener los niveles de comisión" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "No se pudo obtener la factura" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "No se pudo obtener las transacciones" @@ -663,7 +703,7 @@ msgstr "No se pudo importar. Verifique el archivo y la contraseña para pagos" msgid "Could not join wallet" msgstr "No se pudo unir a la billetera" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "No se pudo rechazar el pago" @@ -680,11 +720,12 @@ msgstr "No se pudo quitar tarjeta" msgid "Could not save preferences on the server" msgstr "No se pueden guardar las preferencias en el servidor" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "No se pudo enviar el pago" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "No se pudo enviar la transacción" @@ -738,15 +779,23 @@ msgstr "Creando billetera..." msgid "Creating transaction" msgstr "Creando transacción" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "Tarifa actual de esta política" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "Personalizado" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "Importe Específico" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "Comisión personalizada" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "Eliminar Propuesta de Pago" msgid "Delete Wallet" msgstr "Eliminar billetera" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "Borrar y crear uno nuevo" @@ -788,6 +837,7 @@ msgstr "Camino de derivación" msgid "Derivation Strategy" msgstr "Estrategia de derivación" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" msgstr "Detalles" @@ -832,7 +882,7 @@ msgstr "Editar" msgid "Email" msgstr "Correo electrónico" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "Dirección de correo electrónico" @@ -844,7 +894,7 @@ msgstr "Se ha alcanzado el límite de direcciones vacías. No se pueden generar msgid "Enable camera access in your device settings to get started." msgstr "Habilitar el acceso de la cámara en su configuración de dispositivo para empezar." -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "Activar notificaciones de correo electrónico" @@ -869,6 +919,10 @@ msgstr "Ingrese contraseña para pagos" msgid "Enter Two Factor for your BitPay account" msgstr "Ingrese Autenticación de Dos Pasos para su cuenta de BitPay" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "Ingrese comisión" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Ingrese una nueva contraseña para pagos" @@ -893,10 +947,12 @@ msgstr "Ingrese su contraseña" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "Ingrese su contraseña" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,26 +1005,35 @@ msgstr "Ingrese su contraseña" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Error" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "Error al confirmar" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "Error al crear tarjeta de regalo" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "Error al crear la factura" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "Error al crear billetera" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "Error al obtener información de SendMax" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "Error en el Protocolo de Pago" @@ -991,7 +1057,7 @@ 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:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,7 +1091,7 @@ msgid "Extended Public Keys" msgstr "Claves Públicas Extendidas" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." +msgid "Extracting Wallet information..." msgstr "Obteniendo Información de la billetera..." #: src/js/controllers/export.js:115 @@ -1045,6 +1111,14 @@ msgstr "Fondos para vacaciones en familia" msgid "Fee" msgstr "Comisión" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "Nivel de comisión" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "El nivel de comisión no esta definido" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1059,7 +1133,7 @@ msgid "Fetching BitPay Account..." msgstr "Buscando Cuenta de BitPay..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" +msgid "Fetching payment information" msgstr "Obteniendo información del pago" #: www/views/export.html:14 @@ -1082,6 +1156,8 @@ msgstr "Finalizar" msgid "For audit purposes" msgstr "Para propósitos de auditoría" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1158,14 +1234,26 @@ msgstr "Comienza agregando el primero." msgid "Getting fee levels..." msgstr "Obteniendo niveles de comisión..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "Tarjeta de regalo" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "La tarjeta de regalo expiró" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "Tarjeta de regalo generada y lista para usar." + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "Volver" @@ -1198,7 +1286,7 @@ msgstr "Billetera física" msgid "Help & Support" msgstr "Ayuda & Soporte" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: 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." @@ -1207,7 +1295,7 @@ msgstr "La ayuda está disponible en el sitio web." msgid "Hide" msgstr "Ocultar" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "Balance Oculto" @@ -1282,7 +1370,7 @@ msgstr "Entiendo que mis fondos están protegidos por el dispositivo y no por un msgid "I've written it down" msgstr "Ya he anotado" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 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 está habilitado, se protegerá toda información sensible (clave privada y frase recuperación) y acciones (gastar y exportar) asociadas con esta billetera." @@ -1355,12 +1443,14 @@ msgstr "Formato de código incorrecto" msgid "Incorrect network address" msgstr "Dirección de red incorrecta" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "Fondos insuficientes" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fondos insuficientes para el pago de la comisión" @@ -1369,7 +1459,8 @@ msgstr "Fondos insuficientes para el pago de la comisión" msgid "Invalid" msgstr "Inválido" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "URL incorrecta" @@ -1397,6 +1488,7 @@ 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/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "Cargo por factura" @@ -1504,10 +1596,6 @@ msgstr "Entradas de monto bajo" msgid "Low fees" msgstr "Comisión baja" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "Hacer un pago a" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "Entiendo" @@ -1525,7 +1613,7 @@ msgstr "Yo" msgid "Meh - it's alright" msgstr "Buu - está bien" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "Nota" msgid "Merchant Message" msgstr "Mensaje del comerciante" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "Mensaje" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "Faltan parámetros" @@ -1548,7 +1632,7 @@ msgstr "Faltan parámetros" msgid "Missing private keys to sign" msgstr "Faltan las claves privadas para firmar" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "Más opciones" @@ -1558,7 +1642,7 @@ msgstr "Más opciones" msgid "Moved" msgstr "Movido" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "Fondos movidos" @@ -1577,10 +1661,7 @@ msgstr "Nota: Para importar una billetera de un software de tercero debes ir a A msgid "Name" msgstr "Nombre" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "Red" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" msgstr "Comisión de la Red" @@ -1609,6 +1690,10 @@ msgstr "Próximos pasos" msgid "No Wallet" msgstr "Sin billetera" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "No se ha definido la llave de acceso" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "Sin copia de seguridad, no hay bitcoins." @@ -1625,7 +1710,7 @@ msgstr "No hay información disponible sobre el equipo." msgid "No hardware wallets supported on this device" msgstr "No hay billeteras físicas compatibles con este dispositivo" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "No propuestas de pago pendientes" @@ -1633,7 +1718,8 @@ msgstr "No propuestas de pago pendientes" msgid "No recent transactions" msgstr "No hay transacciones recientes" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "Propuesta sin firmar: No existe la clave privada" @@ -1649,7 +1735,9 @@ msgstr "Se se encontró la billetera" msgid "No wallet selected" msgstr "No se seleccionó una billetera" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" msgstr "No hay billeteras disponibles" @@ -1665,7 +1753,7 @@ msgstr "Normal" msgid "Not authorized" msgstr "No autorizado" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "No hay suficientes fondos para la comisión" @@ -1699,10 +1787,14 @@ msgstr "Notificaciones" msgid "Notifications by email" msgstr "Notificaciones por correo electrónico" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "Notificarme si se confirma" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "Notificarme cuando se confirmen las transacciones" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "Es un buen momento para realizar una copia de seguridad de la billetera. Si este dispositivo se pierde, será imposible acceder a los fondos." @@ -1711,9 +1803,13 @@ 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/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "OK" @@ -1736,7 +1832,7 @@ msgstr "¡Oh no!" 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:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Abrir" @@ -1753,8 +1849,8 @@ msgstr "Abrir GitHub" msgid "Open GitHub Project" msgstr "Abrir Proyecto en GitHub" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Abrir Insight" @@ -1774,6 +1870,10 @@ msgstr "Abrir Sitio Web" msgid "Open wallet" msgstr "Abrir billetera" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "Abrir página web" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "Solicitar BitPay Card" @@ -1809,6 +1909,7 @@ msgstr "Paga 0% de comisión para transformar tus bitcoin en dólares." msgid "Pay To" msgstr "Pagar A" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "Pago Aceptado" @@ -1846,9 +1947,9 @@ msgstr "Pago recibido" msgid "Payment Rejected" msgstr "Pago Rechazado" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Pago Enviado" @@ -1869,7 +1970,7 @@ msgstr "Detalles del pago" msgid "Payment request" msgstr "Solicitud de pago" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "Propuestas de pago pendientes" @@ -1930,7 +2031,7 @@ msgstr "Preparando direcciones..." msgid "Preparing backup..." msgstr "Preparando copia de seguridad..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "Presione nuevamente para salir" @@ -1938,6 +2039,10 @@ msgstr "Presione nuevamente para salir" msgid "Priority" msgstr "Prioritario" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "Clave privada" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "La clave privada está encriptada. Escriba la contraseña" @@ -1950,8 +2055,8 @@ msgstr "La clave privada está encriptada, no puedes firmar" msgid "Proposal Accepted" msgstr "Propuesta Aceptada" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Propuesta Creada" @@ -1968,6 +2073,10 @@ msgstr "Propuesta Rechazada" msgid "Proposals" msgstr "Propuestas" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "El monto de la compra esta limitada a {{limitPerDay}} {{currency}} por día" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "Notificaciones Push" @@ -2006,12 +2115,16 @@ msgstr "Leer más" msgid "Receive" msgstr "Recibir" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "Recibir en" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "Recibido" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "Fondos recibidos" @@ -2056,8 +2169,8 @@ msgstr "Recrear" msgid "Recreating Wallet..." msgstr "Recreando billetera..." -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "Rechazado" @@ -2099,7 +2212,7 @@ msgstr "Escribe nuevamente la contraseña" msgid "Repeat the password" msgstr "Repetir la contraseña" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "Solicitar Huella Digital" @@ -2107,7 +2220,7 @@ msgstr "Solicitar Huella Digital" msgid "Request Specific amount" msgstr "Solicitar importe Especifico" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "Solicitar contraseña para pagos" @@ -2135,7 +2248,7 @@ msgstr "Reintentar" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "Guardar" @@ -2184,7 +2297,7 @@ msgstr "Buscar transacciones" msgid "Search your currency" msgstr "Busca tu moneda" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "Seguridad" @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "Seleccionar el archivo de copia de seguridad" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "Seleccionar una billetera" @@ -2230,7 +2342,7 @@ msgstr "Enviar las direcciones por email" msgid "Send by email" msgstr "Enviar por correo electrónico" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "Enviar desde" @@ -2238,6 +2350,10 @@ msgstr "Enviar desde" msgid "Send max amount" msgstr "Enviar la máxima cantidad" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "Enviar pago a esta dirección" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "En su lugar, enviar comentario" @@ -2265,7 +2381,7 @@ msgstr "Enviando cantidad máxima" msgid "Sending transaction" msgstr "Enviando transacción" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Enviando {{amountStr}} desde tu billetera {{name}}" @@ -2276,7 +2392,7 @@ msgstr "Enviando {{amountStr}} desde tu billetera {{name}}" msgid "Sent" msgstr "Enviado" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "Fondos enviados" @@ -2284,6 +2400,10 @@ msgstr "Fondos enviados" msgid "Server response could not be verified" msgstr "La respuesta del servidor no se ha podido verificar" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "Servicio no disponible" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "Servicios" @@ -2300,6 +2420,10 @@ msgstr "Registro de sesión" msgid "Set up a password" msgstr "Configurar una contraseña" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "Establecer su propia comisión en satoshis/byte" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "Configuración" msgid "Share the love by inviting your friends." msgstr "Comparte la pasión invitando a tus amigos." -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "Compartir esta invitación con sus copayers" @@ -2371,10 +2495,14 @@ msgstr "Billetera de una sola dirección" msgid "Skip" msgstr "Omitir" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "Desliza" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "Deslizar para comprar" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2394,16 +2522,12 @@ msgstr "Se necesita la contraseña para pagos" #: 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" +msgstr "Gastar este balance requiere de significativas comisiones" #: www/views/tab-send.html:28 msgid "Start sending bitcoin" msgstr "Empezar a enviar bitcoin" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "Iniciando..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "Bloqueo inicial" @@ -2420,6 +2544,7 @@ msgstr "Súper Económico" msgid "Sweep" msgstr "Importar" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Importar billetera en papel" @@ -2462,6 +2587,10 @@ msgstr "Términos de Uso" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "Texto" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2556,10 +2685,6 @@ msgstr "El historial de transacciones y cada nueva transacción entrantes se alm msgid "The wallet service URL" msgstr "URL de Wallet Service" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "No dispone de billeteras para realizar este pago" - #: 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" @@ -2583,7 +2708,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:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "Esta solicitud de pago ha caducado." @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). 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:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "Línea de tiempo" @@ -2640,10 +2765,11 @@ msgstr "Para {{reason}} primero debes agregar tu cuenta de BitPay - {{email}}" msgid "Top up in progress..." msgstr "Recarda en progreso..." -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Recargar {{amountStr}} a la tarjeta de débito ({{cardLastNumber}})" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "Total de entradas de la billetera" msgid "Touch ID Failed" msgstr "Falló Touch ID" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "Transacción" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "Transacción creada" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,11 +2809,8 @@ msgstr "Historial de Transacciones" msgid "Transaction already broadcasted" msgstr "La transacción ya fue enviada" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "Transacción creada" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "La transacción no ha sido creada" @@ -2691,7 +2818,7 @@ msgstr "La transacción no ha sido creada" msgid "Transaction initiated" msgstr "Transacción iniciada" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "La transacción no esta disponible en este momento" @@ -2700,6 +2827,10 @@ msgstr "La transacción no esta disponible en este momento" msgid "Transaction not found" msgstr "Transacción no encontrada" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "Las transacciones sin comisión no están soportadas." + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "Transferir a" @@ -2748,7 +2879,7 @@ msgstr "Limite de direcciones sin uso" msgid "Update Available" msgstr "Actualización Disponible" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "Actualizando propuestas de pago pendientes. Por favor, espera" @@ -2793,8 +2924,8 @@ msgstr "Ver todas las direcciones" msgid "View Terms of Service" msgstr "Ver Términos de Uso" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Ver Transacción en Insight" @@ -2802,7 +2933,7 @@ msgstr "Ver Transacción en Insight" msgid "View Update" msgstr "Ver Actualización" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "Ver en blockchain" @@ -2830,11 +2961,11 @@ msgstr "Esperando a Ledger..." msgid "Waiting for Trezor..." msgstr "Esperando a Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "Esperando a los demás copayers" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "Esperando..." @@ -2926,7 +3057,7 @@ msgstr "La billetera ya existe en Copay" msgid "Wallet created" msgstr "Billetera Creada" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "Billetera incompleta y rota" @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "Billeteras & Integraciones" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "Siempre estamos buscando maneras de mejorar {{appName}}." msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "Siempre estamos buscando maneras de mejorar {{appName}}. ¿Cómo podríamos mejorar tu experiencia?" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "Página web" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "¡Siempre estamos buscando aportes de traducción! Puedes ayudar a que esta aplicación esté disponible en tu idioma nativo uniéndote a nuestra comunidad en Crowdin." @@ -3093,11 +3228,15 @@ msgstr "Puedes cambiarlo por otras monedas como Dólares, Euros o Libras." msgid "You control your bitcoin." msgstr "Controlas tus bitcoins." +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "No debería elegir una comisión superior a {{maxFeeRecommended}} satoshis/byte." + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "Tendrá que iniciar sesión para completar su BitPay Card." -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "Recibirás notificaciones por correo electrónico acerca de pagos enviados y recibidos de tus billeteras." @@ -3113,6 +3252,10 @@ msgstr "¡Su billetera bitcoin está resguardada!" msgid "Your bitcoin wallet is ready!" msgstr "¡Su billetera bitcoin está lista!" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "Tu comisión es inferior a la recomendada." + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "Ideas, sugerencias o comentarios" @@ -3130,6 +3273,14 @@ msgstr "Sobrenombre" msgid "Your password" msgstr "Contraseña" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "No se pudo completar la compra" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "Tu compra fue agregada a la lista de pendientes" + #: www/views/onboarding/backupRequest.html:10 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." @@ -3167,25 +3318,29 @@ msgstr "nombre@ejemplo.com" msgid "preparing..." msgstr "preparando..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "para aceptar" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "para pagar" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "para enviar" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "{{amountStr}} en tarjeta de regalo de Amazon.com" + #: 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 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:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} se descontará por comisión de la red bitcoin." @@ -3197,7 +3352,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} de la cantidad a enviar" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transacciones descargadas" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-de-{{wallet.n}}" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index 41b41f11a..4755666d6 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: French\n" "Language: fr\n" -"PO-Revision-Date: 2017-06-29 08:10-0400\n" +"PO-Revision-Date: 2017-07-18 14:36-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -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:347 +#: src/js/controllers/confirm.js:351 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:341 +#: src/js/controllers/confirm.js:345 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." @@ -56,8 +56,8 @@ msgstr "Un total de {{amountBelowFeeStr}} a été exclu. Ces fonds proviennent d msgid "About" msgstr "À propos" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "Acceptée" @@ -117,7 +117,11 @@ 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:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "Ajouter comme contact" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "Ajouter une description" @@ -136,7 +140,6 @@ msgstr "Ajouter un portefeuille" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "Adresse" @@ -194,10 +197,13 @@ msgstr "C'est presque terminé ! Vérifions." msgid "Alternative Currency" msgstr "Devise alternative" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "Amazon.com n’est pas disponible pour le moment. Veuillez réessayer plus tard." + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "Montant" @@ -205,7 +211,7 @@ msgstr "Montant" msgid "Amount below minimum allowed" msgstr "Montant en dessous du minimum autorisé" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "Le montant est trop élevé" @@ -219,7 +225,7 @@ msgstr "Une mise à jour de cette appli est disponible. Pour votre sécurité, v #: www/views/backupWarning.html:14 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." +msgstr "Quelqu'un disposant de votre phrase de sauvegarde peut dépenser vos bitcoins." #: www/views/addresses.html:94 msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" @@ -245,11 +251,11 @@ msgstr "Souhaitez-vous réellement supprimer ce contact ?" msgid "Are you sure you want to delete this wallet?" msgstr "Êtes-vous certain(e) de vouloir supprimer ce portefeuille ?" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "Êtes-vous certain(e) de vouloir rejeter cette transaction ?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "Êtes-vous certain(e) de vouloir supprimer cette transaction ?" @@ -278,7 +284,7 @@ msgstr "Disponible" msgid "Available Balance" msgstr "Solde disponible" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "Temps de confirmation moyen " @@ -290,7 +296,7 @@ msgstr "Temps de confirmation moyen " msgid "BIP32 path for address derivation" msgstr "Chemin BIP32 pour la dérivation de l'adresse" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "Sauvegarder" @@ -302,7 +308,7 @@ msgstr "Sauvegarde requise" msgid "Backup all livenet wallets before using this function" msgstr "Sauvegardez tous les portefeuilles (livenet) avant d'utiliser cette fonction" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "Sauvegarde requise" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "BitPay Visa® Cards" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "Adresse bitcoin" @@ -346,10 +353,6 @@ msgstr "Adresse bitcoin" msgid "Bitcoin Network Fee Policy" msgstr "Frais de réseau" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "L'URI Bitcoin n'est pas valide !" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Unité de Bitcoin" @@ -370,12 +373,16 @@ msgstr "Bitcoin est de l'argent
numérique sécurisé." msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "Les transactions Bitcoin incluent des frais collectés par les mineurs du réseau." +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "{{amountUnitStr}} achetés" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "Diffuser le paiement" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "Diffusée" @@ -387,7 +394,11 @@ msgstr "Diffusion de la transaction" msgid "Browser unsupported" msgstr "Navigateur non supporté" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "Acheter" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "Acheter & vendre des bitcoins" @@ -395,6 +406,10 @@ msgstr "Acheter & vendre des bitcoins" msgid "Buy Bitcoin" msgstr "Acheter des bitcoins" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "Acheter depuis" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "Achat de bitcoins..." @@ -403,18 +418,24 @@ msgstr "Achat de bitcoins..." msgid "Calculating fee" msgstr "Calcul des frais" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "Annuler" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "Annuler l'invitation" @@ -426,7 +447,7 @@ msgstr "Impossible de créer le portefeuille" msgid "Cannot join the same wallet more that once" msgstr "Impossible de rejoindre le même portefeuille plus d'une fois" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "Cartes" @@ -458,12 +479,13 @@ msgstr "Effacer" msgid "Clear cache" msgstr "Vider le cache" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "Cliquez" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,7 +500,7 @@ msgstr "Couleur" msgid "Commit hash" msgstr "Commit hash" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "Terminez le processus de sauvegarde pour utiliser cette option" @@ -486,9 +508,10 @@ msgstr "Terminez le processus de sauvegarde pour utiliser cette option" msgid "Completed" msgstr "Terminé" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "Confirmer" msgid "Confirm & Finish" msgstr "Confirmer & Terminer" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "Confirmer l'achat" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "Confirmez votre PIN" @@ -576,6 +603,9 @@ msgstr "Copié(e) dans le presse-papier" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Copiez ce texte présenté tel quel vers un endroit sûr (bloc-notes ou e-mail)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "Copier dans le presse-papier" msgid "Could not access the wallet at the server. Please check:" msgstr "Impossible d'accéder au portefeuille via le serveur. Veuillez vérifier :" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "Impossible d'accéder à Amazon.com" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "Impossible d’accéder au portefeuille" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Could not add message to imported wallet without shared encrypting key" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "Impossible de diffuser le paiement" @@ -605,11 +639,12 @@ msgstr "Impossible de créer la transaction" msgid "Could not create address" msgstr "Impossible de créer l'adresse" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "Impossible de créer la facture" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "Impossible de créer la transaction" @@ -629,23 +664,28 @@ msgstr "Impossible de créer : Phrase de récupération du portefeuille invalide msgid "Could not decrypt file, check your password" msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "Impossible de supprimer la proposition de paiement" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "Impossible d'obtenir les frais dynamiques" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 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 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "Impossible d'obtenir les niveaux de frais" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "Impossible d'obtenir la facture" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "Impossible de récupérer les transactions" @@ -663,7 +703,7 @@ msgstr "Impossible d'importer. Vérifiez le fichier d'entrée et le code de dép msgid "Could not join wallet" msgstr "Impossible de rejoindre le portefeuille" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "Impossible de rejeter le paiement" @@ -680,11 +720,12 @@ msgstr "Impossible de supprimer la carte" msgid "Could not save preferences on the server" msgstr "Impossible d'enregistrer les préférences sur le serveur" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "Impossible d'envoyer le paiement" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "Impossible d'envoyer la transaction" @@ -738,15 +779,23 @@ msgstr "Création du portefeuille..." msgid "Creating transaction" msgstr "Création de la transaction" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "Frais actuels pour ce choix " +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "Personnalisés" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "Montant personnalisé" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "Frais personnalisés" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "Supprimer la proposition de paiement" msgid "Delete Wallet" msgstr "Supprimer le portefeuille" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "Le supprimer et en créer un nouveau" @@ -788,6 +837,7 @@ msgstr "Chemin de dérivation" msgid "Derivation Strategy" msgstr "Stratégie de dérivation" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" msgstr "Détails" @@ -808,7 +858,7 @@ msgstr "Ne pas inclure la clé privée" #: www/views/preferencesLanguage.html:21 msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." -msgstr "Vous ne voyez pas votre langue sur Crowdin ? Contactez le propriétaire sur Crowdin ! Nous serions ravis de prendre en charge votre langue." +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:22 @@ -832,7 +882,7 @@ msgstr "Modifier" msgid "Email" msgstr "E-mail" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "Adresse e-mail" @@ -844,7 +894,7 @@ msgstr "La limite d'adresses vides a été atteinte. Les nouvelles adresses ne p msgid "Enable camera access in your device settings to get started." msgstr "Autorisez l’accès à la caméra dans les réglages de votre appareil pour commencer." -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "Activer les notifications e-mail" @@ -869,6 +919,10 @@ msgstr "Saisissez le code de dépenses" msgid "Enter Two Factor for your BitPay account" msgstr "Saisissez le code à deux facteurs pour votre compte BitPay" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "Saisissez des frais personnalisés" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Saisissez un nouveau code de dépenses" @@ -893,10 +947,12 @@ msgstr "Écrivez votre mot de passe" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "Écrivez votre mot de passe" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,26 +1005,35 @@ msgstr "Écrivez votre mot de passe" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Erreur" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "Erreur à la confirmation" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "Erreur de création de la carte-cadeau" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "Erreur de création de la facture" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "Erreur de création du portefeuille" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "Erreur d’obtention de l'information SendMax" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "Erreur dans le protocole de paiement" @@ -991,7 +1057,7 @@ 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:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,7 +1091,7 @@ msgid "Extended Public Keys" msgstr "Clés publiques étendues" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." +msgid "Extracting Wallet information..." msgstr "Extraction des informations du portefeuille..." #: src/js/controllers/export.js:115 @@ -1045,6 +1111,14 @@ msgstr "Fonds pour les vacances familiales" msgid "Fee" msgstr "Frais" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "Niveau de frais" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "Le niveau de frais n'est pas défini" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1059,7 +1133,7 @@ msgid "Fetching BitPay Account..." msgstr "Récupération du compte BitPay..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" +msgid "Fetching payment information" msgstr "Récupération des informations de paiement" #: www/views/export.html:14 @@ -1082,6 +1156,8 @@ msgstr "Terminer" msgid "For audit purposes" msgstr "À des fins de vérification" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1158,14 +1234,26 @@ msgstr "Commencez par ajouter votre premier contact." msgid "Getting fee levels..." msgstr "Obtention des niveaux de frais..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "Carte-cadeau" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "Carte-cadeau expirée" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "Carte-cadeau générée et prête à l’emploi." + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "Retour" @@ -1198,16 +1286,16 @@ msgstr "Portefeuille matériel" msgid "Help & Support" msgstr "Aide & Support" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: 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." +msgstr "De l'aide peut être trouvée sur le site internet (en anglais pour le moment)." #: www/views/addresses.html:25 msgid "Hide" msgstr "Masquer" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "Masquer le solde" @@ -1282,9 +1370,9 @@ msgstr "Je comprends que mes fonds sont en toute sécurité sur cet appareil et msgid "I've written it down" msgstr "Je l'ai bien écrite" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 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 exportations) associées à ce portefeuille seront protégées." +msgstr "Si l'option est activée, 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." @@ -1355,12 +1443,14 @@ msgstr "Format du code incorrect" msgid "Incorrect network address" msgstr "Adresse réseau invalide" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "Fonds insuffisants" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fonds insuffisants pour les frais" @@ -1369,7 +1459,8 @@ msgstr "Fonds insuffisants pour les frais" msgid "Invalid" msgstr "Invalide" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "URL invalide" @@ -1397,6 +1488,7 @@ msgstr "Chemin de dérivation invalide" msgid "Invitation to share a {{appName}} Wallet" msgstr "Invitation pour partager un portefeuille {{appName}}" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "Frais de facturation" @@ -1504,10 +1596,6 @@ msgstr "Entrées de faible montant" msgid "Low fees" msgstr "Frais faibles" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "Faire un paiement à" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "C'est logique" @@ -1525,7 +1613,7 @@ msgstr "Moi" msgid "Meh - it's alright" msgstr "Ça peut aller" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "Note" msgid "Merchant Message" msgstr "Message marchand" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "Message" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "Paramètre manquant" @@ -1548,7 +1632,7 @@ msgstr "Paramètre manquant" msgid "Missing private keys to sign" msgstr "Clés privées manquantes pour signer" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "Plus d'options" @@ -1558,7 +1642,7 @@ msgstr "Plus d'options" msgid "Moved" msgstr "Déplacés" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "Fonds déplacés" @@ -1577,10 +1661,7 @@ msgstr "Remarque : Pour importer un portefeuille d’un autre logiciel que Copay msgid "Name" msgstr "Nom" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "Réseau" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" msgstr "Frais de réseau" @@ -1609,6 +1690,10 @@ msgstr "Prochaines étapes" msgid "No Wallet" msgstr "Aucun portefeuille" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "Aucune clé d’accès définie" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "Pas de sauvegarde, pas de bitcoin." @@ -1625,7 +1710,7 @@ msgstr "Aucune information matérielle disponible." msgid "No hardware wallets supported on this device" msgstr "Aucun portefeuille matériel pris en charge sur cet appareil" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "Aucune proposition en attente" @@ -1633,7 +1718,8 @@ msgstr "Aucune proposition en attente" msgid "No recent transactions" msgstr "Aucune transaction récente" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "Aucune proposition de signature : aucune clé privée" @@ -1649,7 +1735,9 @@ msgstr "Aucun portefeuille trouvé" msgid "No wallet selected" msgstr "Aucun portefeuille sélectionné" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" msgstr "Aucun portefeuille disponible" @@ -1665,7 +1753,7 @@ msgstr "Normaux" msgid "Not authorized" msgstr "Non autorisé" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "Pas assez de fonds pour les frais" @@ -1699,21 +1787,29 @@ msgstr "Notifications" msgid "Notifications by email" msgstr "Notifications par e-mail" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "Me notifier si la transaction se confirme" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "Me notifier quand les transactions se confirment" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "C'est un bon moment pour sauvegarder votre portefeuille. Si cet appareil est perdu, vos fonds seront irrécupérables sans une sauvegarde." #: www/views/backupWarning.html:11 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" -msgstr "C'est le moment d'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/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "Ok" @@ -1736,7 +1832,7 @@ msgstr "Oh non !" 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:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Ouvrir" @@ -1753,8 +1849,8 @@ msgstr "Ouvrir GitHub" msgid "Open GitHub Project" msgstr "Ouvrir le projet GitHub" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Ouvrir Insight" @@ -1774,6 +1870,10 @@ msgstr "Ouvrir le site internet" msgid "Open wallet" msgstr "Ouvrir le portefeuille" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "Ouvrir le site internet" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "Commander la BitPay Card" @@ -1809,6 +1909,7 @@ msgstr "Aucun frais pour échanger des bitcoins en dollars." msgid "Pay To" msgstr "Payer à" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "Paiement accepté" @@ -1846,9 +1947,9 @@ msgstr "Paiement reçu" msgid "Payment Rejected" msgstr "Paiement rejeté" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Paiement envoyé" @@ -1869,7 +1970,7 @@ msgstr "Détails du paiement" msgid "Payment request" msgstr "Demande de paiement" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "Propositions en attente" @@ -1930,7 +2031,7 @@ msgstr "Préparation des adresses..." msgid "Preparing backup..." msgstr "Préparation de la sauvegarde..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "Appuyez de nouveau pour quitter" @@ -1938,6 +2039,10 @@ msgstr "Appuyez de nouveau pour quitter" msgid "Priority" msgstr "Élevés" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "Clé privée" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "Clé privée chiffrée. Saisissez le mot de passe" @@ -1950,8 +2055,8 @@ msgstr "La clé privée est chiffrée, impossible de signer" msgid "Proposal Accepted" msgstr "Proposition acceptée" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Proposition créée" @@ -1968,6 +2073,10 @@ msgstr "Proposition rejetée" msgid "Proposals" msgstr "Propositions" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "Le montant d'achat est limité à {{limitPerDay}} {{currency}} par jour" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "Notifications" @@ -1982,7 +2091,7 @@ msgstr "Code QR" #: www/views/onboarding/disclaimer.html:13 msgid "Quick review!" -msgstr "Revue rapide !" +msgstr "Récapitulatif !" #: src/js/controllers/create.js:79 #: src/js/controllers/join.js:65 @@ -2006,12 +2115,16 @@ msgstr "En savoir plus" msgid "Receive" msgstr "Recevoir" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "Recevoir dans" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "Reçus" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "Fonds reçus" @@ -2056,8 +2169,8 @@ msgstr "Recréer" msgid "Recreating Wallet..." msgstr "Recréation du portefeuille..." -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "Rejetée" @@ -2099,7 +2212,7 @@ msgstr "Confirmez le mot de passe" msgid "Repeat the password" msgstr "Confirmez le mot de passe" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "Demander l'empreinte digitale" @@ -2107,7 +2220,7 @@ msgstr "Demander l'empreinte digitale" msgid "Request Specific amount" msgstr "Demander un montant précis" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "Demander un code de dépenses" @@ -2135,7 +2248,7 @@ msgstr "Réessayer la caméra" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "Valider" @@ -2184,7 +2297,7 @@ msgstr "Rechercher des transactions" msgid "Search your currency" msgstr "Rechercher votre monnaie" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "Sécurité " @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "Sélectionner un fichier de sauvegarde" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "Sélectionner un portefeuille" @@ -2230,7 +2342,7 @@ msgstr "Envoyer les adresses par e-mail" msgid "Send by email" msgstr "Envoyer par e-mail" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "Envoyer à partir de" @@ -2238,6 +2350,10 @@ msgstr "Envoyer à partir de" msgid "Send max amount" msgstr "Envoyer le montant maximal" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "Envoyer le paiement à cette adresse" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "Nous envoyer un avis à la place" @@ -2265,7 +2381,7 @@ msgstr "Envoi du montant maximal" msgid "Sending transaction" msgstr "Envoi de la transaction" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Envoi de {{amountStr}} depuis votre portefeuille {{name}}" @@ -2276,7 +2392,7 @@ msgstr "Envoi de {{amountStr}} depuis votre portefeuille {{name}}" msgid "Sent" msgstr "Envoyés" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "Fonds envoyés" @@ -2284,6 +2400,10 @@ msgstr "Fonds envoyés" msgid "Server response could not be verified" msgstr "La réponse du serveur n'a pas pu être vérifiée" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "Service non disponible" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "Services" @@ -2300,6 +2420,10 @@ msgstr "Journal de session" msgid "Set up a password" msgstr "Spécifiez un mot de passe" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "Définissez vos propres frais en satoshis/byte" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "Paramètres" msgid "Share the love by inviting your friends." msgstr "Partagez l’amour en invitant vos amis." -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "Partagez cette invitation avec vos copayers" @@ -2371,10 +2495,14 @@ msgstr "Portefeuille d'adresse unique" msgid "Skip" msgstr "Ignorer" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "Faites glisser" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "Faites glisser pour acheter" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2400,10 +2528,6 @@ msgstr "La dépense de ce solde demandera d'importants frais de réseau Bitcoin" msgid "Start sending bitcoin" msgstr "Commencez à envoyer des bitcoins" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "Démarrage..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "Verrou au démarrage de l'appli" @@ -2420,6 +2544,7 @@ msgstr "Infimes" msgid "Sweep" msgstr "Balayer" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Balayer un portefeuille de papier" @@ -2462,6 +2587,10 @@ msgstr "Conditions d'utilisation" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "Texte" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2475,7 +2604,7 @@ msgstr "Merci !" #: src/js/controllers/feedback/send.js:73 msgid "That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?" -msgstr "C'est intéressant à entendre. Nous aimerions obtenir une note de 5 étoiles de votre part – comment pourrions-nous améliorer votre expérience ?" +msgstr "Votre avis nous intéresse ! Nous aimerions obtenir une note de 5 étoiles de votre part – comment pourrions-nous améliorer votre expérience ?" #: src/js/services/ledger.js:152 msgid "The Ledger Chrome application is not installed" @@ -2556,10 +2685,6 @@ msgstr "L’historique des transactions et chaque nouvelle transaction entrante msgid "The wallet service URL" msgstr "L’URL du service de portefeuille" -#: www/views/paymentUri.html:23 -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:38 msgid "There is a new version of {{appName}} available" msgstr "Une nouvelle version de {{appName}} est disponible" @@ -2583,7 +2708,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:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "Cette demande de paiement bitcoin a expiré." @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). 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:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "Chronologie" @@ -2640,10 +2765,11 @@ msgstr "Pour {{reason}} vous devez d'abord ajouter votre compte BitPay - {{email msgid "Top up in progress..." msgstr "Rechargement en cours..." -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Rechargement de {{amountStr}} vers la carte de débit ({{cardLastNumber}})" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "Entrées de portefeuille totales" msgid "Touch ID Failed" msgstr "Touch ID a échoué" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "Transaction" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "Transaction créée" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,11 +2809,8 @@ msgstr "Historique des transactions" msgid "Transaction already broadcasted" msgstr "Transaction déjà diffusée" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "Transaction créée" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "La transaction n'a pas été créée" @@ -2691,7 +2818,7 @@ msgstr "La transaction n'a pas été créée" msgid "Transaction initiated" msgstr "Transaction initiée" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "La transaction n'est pas disponible pour l'instant" @@ -2700,6 +2827,10 @@ msgstr "La transaction n'est pas disponible pour l'instant" msgid "Transaction not found" msgstr "Transaction introuvable" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "Les transactions sans frais ne sont pas supportées." + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "Transférer à" @@ -2748,7 +2879,7 @@ msgstr "Limite des adresses inutilisées" msgid "Update Available" msgstr "Mise à jour disponible" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "Mise à jour des propositions en attente. Veuillez patienter" @@ -2793,8 +2924,8 @@ msgstr "Voir toutes les adresses" msgid "View Terms of Service" msgstr "Voir les conditions d'utilisation" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Voir la transaction sur Insight" @@ -2802,7 +2933,7 @@ msgstr "Voir la transaction sur Insight" msgid "View Update" msgstr "Voir la mise à jour" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "Voir sur la blockchain" @@ -2830,11 +2961,11 @@ msgstr "En attente de Ledger..." msgid "Waiting for Trezor..." msgstr "En attente de Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "Attente des copayers" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "Attente..." @@ -2926,7 +3057,7 @@ msgstr "Le portefeuille existe déjà dans Copay" msgid "Wallet created" msgstr "Portefeuille créé" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "Portefeuille incomplet et cassé " @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "Portefeuilles & intégrations" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "Nous recherchons constamment des moyens afin d'améliorer {{appName}}." msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "Nous recherchons constamment des moyens afin d'améliorer {{appName}}. Comment pourrions-nous améliorer votre expérience ?" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "Site internet" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "Nous recherchons toujours des contributions de traduction ! Vous pouvez apporter des corrections ou aider à rendre cette application disponible dans votre langue maternelle en rejoignant notre communauté sur Crowdin." @@ -3067,7 +3202,7 @@ msgstr "Vous pouvez créer une sauvegarde plus tard à partir des paramètres de #: src/js/controllers/preferencesLanguage.js:12 msgid "You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!" -msgstr "Vous pouvez faire des contributions en vous inscrivant sur notre site internet de traduction communautaire Crowdin. Nous sommes impatients de vous y voir !" +msgstr "Vous pouvez apporter des contributions en vous inscrivant sur notre site internet de traduction communautaire Crowdin. Nous sommes impatients de vous y voir !" #: www/views/tab-scan.html:16 msgid "You can scan bitcoin addresses, payment requests, paper wallets, and more." @@ -3093,11 +3228,15 @@ msgstr "Vous pouvez l’échanger contre d'autres monnaies comme le dollar amér msgid "You control your bitcoin." msgstr "Vous contrôlez vos bitcoins." +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "Vous ne devriez pas définir des frais plus élevés que {{maxFeeRecommended}} satoshis/byte." + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "Vous devrez vous reconnecter pour approvisionner votre BitPay Card." -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "Vous recevrez des notifications par e-mail concernant les paiements envoyés et reçus depuis vos portefeuilles." @@ -3113,6 +3252,10 @@ msgstr "Votre portefeuille bitcoin est sauvegardé !" msgid "Your bitcoin wallet is ready!" msgstr "Votre portefeuille bitcoin est prêt !" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "Vos frais sont inférieurs au niveau recommandé." + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "Vos idées, vos commentaires ou observations" @@ -3130,6 +3273,14 @@ msgstr "Votre surnom" msgid "Your password" msgstr "Votre mot de passe" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "Votre achat n'a pas pu aboutir" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "Votre achat a été ajouté à la liste d’attente" + #: www/views/onboarding/backupRequest.html:10 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." @@ -3167,25 +3318,29 @@ msgstr "nom@exemple.com" msgid "preparing..." msgstr "préparation..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "pour accepter" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "pour payer" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "pour envoyer" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "{{amountStr}} pour la carte-cadeau Amazon.com" + #: 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}} 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:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin." @@ -3197,7 +3352,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} du montant d'envoi" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transactions téléchargées" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-sur-{{wallet.n}}" diff --git a/i18n/po/it.po b/i18n/po/it.po index 6a96652ac..d711b0826 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Italian\n" "Language: it\n" -"PO-Revision-Date: 2017-06-29 07:15-0400\n" +"PO-Revision-Date: 2017-07-18 13:18-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -28,11 +28,11 @@ msgstr "* Una proposta di pagamento può essere eliminata se 1) Tu sei il creato #: www/views/tx-details.html:84 msgid "- {{btx.feeRateStr}} of the transaction" -msgstr "" +msgstr "- {{btx.feeRateStr}} della transazione" #: www/views/modals/txp-details.html:104 msgid "- {{tx.feeRateStr}} of the transaction" -msgstr "" +msgstr "- {{tx.feeRateStr}} della transazione" #: 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 "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:347 +#: src/js/controllers/confirm.js:351 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:341 +#: src/js/controllers/confirm.js:345 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." @@ -56,8 +56,8 @@ msgstr "Un totale di {{amountBelowFeeStr}} è stato escluso. Questi fondi proven msgid "About" msgstr "Informazioni" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "Accettata" @@ -117,17 +117,21 @@ 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:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "Aggiungi descrizione" #: www/views/topup.html:6 msgid "Add funds" -msgstr "" +msgstr "Aggiungi fondi" #: src/js/services/bitpayAccountService.js:78 msgid "Add this BitPay account ({{email}})?" -msgstr "" +msgstr "Aggiungere questo account BitPay ({{email}})?" #: www/views/add.html:3 msgid "Add wallet" @@ -136,7 +140,6 @@ msgstr "Aggiungi un portafoglio" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "Indirizzo" @@ -194,10 +197,13 @@ msgstr "Quasi finito! Ripassiamo." msgid "Alternative Currency" msgstr "Valuta alternativa" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "Ammontare" @@ -205,13 +211,13 @@ msgstr "Ammontare" msgid "Amount below minimum allowed" msgstr "Importo inferiore al minimo consentito" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "Quantità troppo grande" #: www/views/includes/walletHistory.html:31 msgid "Amount too low to spend" -msgstr "" +msgstr "Quantità troppo bassa per essere spesa" #: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." @@ -245,11 +251,11 @@ msgstr "Sei sicuro di voler cancellare questo contatto?" msgid "Are you sure you want to delete this wallet?" msgstr "Sei sicuro di voler eliminare questo portafoglio?" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "Sei sicuro di voler rifiutare questa transazione?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "Sei sicuro di voler rimuovere questa transazione?" @@ -278,7 +284,7 @@ msgstr "Disponibile" msgid "Available Balance" msgstr "Saldo disponibile" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "Tempo previsto per la conferma" @@ -290,7 +296,7 @@ msgstr "Tempo previsto per la conferma" msgid "BIP32 path for address derivation" msgstr "Percorso BIP32 per generare l'indirizzo" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "Backup" @@ -302,7 +308,7 @@ msgstr "Backup necessario" msgid "Backup all livenet wallets before using this function" msgstr "Fai un backup di tutti i portafogli sulla livenet prima di utilizzare questa funzione" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "Backup necessario" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "Carte di BitPay Visa®" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "Indirizzo Bitcoin" @@ -346,10 +353,6 @@ msgstr "Indirizzo Bitcoin" msgid "Bitcoin Network Fee Policy" msgstr "Criterio delle Commissioni del Bitcoin Network" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "Il Bitcoin URI NON è valido!" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Unità di Bitcoin" @@ -370,12 +373,16 @@ msgstr "Bitcoin è sicuro,
moneta digitale." msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "Le transazioni Bitcoin comprendono un supplemento che viene raccolto dai mines nella rete." +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "Diffusione del Pagamento" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "Trasmesso" @@ -387,7 +394,11 @@ msgstr "Diffondendo la transazione" msgid "Browser unsupported" msgstr "Browser non supportato" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "Comprare & Vendere Bitcoin" @@ -395,6 +406,10 @@ msgstr "Comprare & Vendere Bitcoin" msgid "Buy Bitcoin" msgstr "Acquista Bitcoin" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "Comprare Bitcoin..." @@ -403,18 +418,24 @@ msgstr "Comprare Bitcoin..." msgid "Calculating fee" msgstr "Calcolo commissione" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "Annulla" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "Annulla invito" @@ -426,7 +447,7 @@ msgstr "Impossibile creare portafoglio" msgid "Cannot join the same wallet more that once" msgstr "Non è possibile aggiungere un portafoglio più di una volta" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "Carte" @@ -458,12 +479,13 @@ msgstr "Elimina" msgid "Clear cache" msgstr "Svuota la cache" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "Click" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,7 +500,7 @@ msgstr "Colore" msgid "Commit hash" msgstr "Commit hash" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "Completare il processo di backup per utilizzare questa opzione" @@ -486,9 +508,10 @@ msgstr "Completare il processo di backup per utilizzare questa opzione" msgid "Completed" msgstr "Completato" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "Conferma" msgid "Confirm & Finish" msgstr "Confirm & concludi" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "Conferma il tuo PIN" @@ -576,6 +603,9 @@ msgstr "Copiato negli appunti" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Copia questo testo cosí com'è in un posto sicuro (blocco note o email)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "Copia negli appunti" msgid "Could not access the wallet at the server. Please check:" msgstr "Non può accedere al portafoglio sul server. Si prega di controllare:" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "Impossibile accedere al portafoglio" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 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" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "Impossibile trasmettere il pagamento" @@ -605,13 +639,14 @@ msgstr "Non è possibile generare la transazione" msgid "Could not create address" msgstr "Impossibile creare un indirizzo" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" -msgstr "" +msgstr "Non è possibile creare la transazione" #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" @@ -629,23 +664,28 @@ msgstr "Impossibile creare: Frase di recupero portafoglio non valida" msgid "Could not decrypt file, check your password" msgstr "Impossibile decifrare il file, controlla la tua password" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "Impossibile eliminare la proposta di pagamento" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "Impossibile avere commissioni dinamiche" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Impossibile avere la commissione per il livello: {{feeLevel}}" -#: src/js/controllers/topup.js:94 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "Non è possibile ottenere le transazioni" @@ -663,7 +703,7 @@ msgstr "Impossibile importare. Controlla il file da importare e la password di s msgid "Could not join wallet" msgstr "Impossibile partecipare al portafoglio" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "Impossibile rifiutare il pagamento" @@ -680,11 +720,12 @@ msgstr "Impossibile rimuovere la carta" msgid "Could not save preferences on the server" msgstr "Impossibile salvare le preferenze nel server" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "Impossibile inviare il pagamento" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "" @@ -738,15 +779,23 @@ msgstr "Creazione Portafoglio..." msgid "Creating transaction" msgstr "Creazione transazione" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "Attuale commissione con questa politica" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "Importo personalizzato" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "Elimina Proposta di Pagamento" msgid "Delete Wallet" msgstr "Elimina Portafoglio" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "Eliminalo e creane uno nuovo" @@ -788,9 +837,10 @@ msgstr "Percorso derivato" msgid "Derivation Strategy" msgstr "Strategia di derivazione" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" -msgstr "" +msgstr "Dettagli" #: src/js/controllers/lockSetup.js:9 #: src/js/controllers/tab-settings.js:60 @@ -832,7 +882,7 @@ msgstr "Modifica" msgid "Email" msgstr "Email" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "Indirizzo Email" @@ -844,7 +894,7 @@ msgstr "Raggiunto il limite degli indirizzi vuoti. Non possono essere generati n msgid "Enable camera access in your device settings to get started." msgstr "Abilita l'accesso alla fotocamera dalle impostazioni del tuo dispositivo per iniziare." -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "Attiva Notifiche Email" @@ -869,6 +919,10 @@ msgstr "Inserisci Password di spesa" msgid "Enter Two Factor for your BitPay account" msgstr "Inserisci Due Fattori per il tuo account BitPay" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Inserisci la nuova password di spesa" @@ -893,10 +947,12 @@ msgstr "Inserisci la tua password" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "Inserisci la tua password" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,28 +1005,37 @@ msgstr "Inserisci la tua password" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Errore" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "Errore di conferma" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "Errore creazione portafoglio" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" -msgstr "" +msgstr "Errore nel protocollo di pagamento" #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" @@ -991,7 +1057,7 @@ 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:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,8 +1091,8 @@ msgid "Extended Public Keys" msgstr "Chiave pubblica estesa" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." -msgstr "Estrazione delle informazioni sul portafoglio..." +msgid "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1045,6 +1111,14 @@ msgstr "Fondi vacanza di famiglia" msgid "Fee" msgstr "Tassa" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1059,8 +1133,8 @@ msgid "Fetching BitPay Account..." msgstr "Recupero Account BitPay..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" -msgstr "Recuperando le informazioni del pagamento" +msgid "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 @@ -1082,6 +1156,8 @@ msgstr "Fine" msgid "For audit purposes" msgstr "Per finalità di controllo" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1095,7 +1171,7 @@ msgstr "Dal conto BitPay" #: www/views/tab-import-phrase.html:54 msgid "From Hardware Wallet" -msgstr "" +msgstr "Dal portafoglio Hardware" #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" @@ -1111,7 +1187,7 @@ msgstr "Fondi trovati:" #: www/views/topup.html:49 msgid "Funds to be added" -msgstr "" +msgstr "Fondi da aggiungere" #: www/views/paperWallet.html:53 msgid "Funds transferred" @@ -1119,7 +1195,7 @@ msgstr "Fondi trasferiti" #: www/views/topup.html:103 msgid "Funds were added to debit card" -msgstr "" +msgstr "I fondi sono stati aggiunti alla carta di debito" #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" @@ -1158,14 +1234,26 @@ msgstr "Inizia aggiungendo il tuo primo." msgid "Getting fee levels..." msgstr "Ottenendo i livelli di commissione..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "Indietro" @@ -1198,7 +1286,7 @@ msgstr "Portafoglio hardware" msgid "Help & Support" msgstr "Aiuto e Assistenza" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: 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." @@ -1207,7 +1295,7 @@ msgstr "Guida e informazioni di supporto tecnico sono disponibili sul sito web." msgid "Hide" msgstr "Nascondere" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "Nascondere saldo" @@ -1282,7 +1370,7 @@ msgstr "Ho capito che i miei fondi sono custoditi in sicurezza in questa disposi msgid "I've written it down" msgstr "L'ho scritto" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "Se attivata, tutte le informazioni sensibili (chiavi private e recupero della passhphrase) e azioni (spesa ed esportazione) associate a questo portafoglio saranno protette." @@ -1353,14 +1441,16 @@ msgstr "Formato qrcode non corretto" #: src/js/services/bwcError.js:113 msgid "Incorrect network address" -msgstr "" +msgstr "Indirizzo di rete non corretto" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "Fondi insufficienti" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fondi insufficienti per la commissione" @@ -1369,9 +1459,10 @@ msgstr "Fondi insufficienti per la commissione" msgid "Invalid" msgstr "Invalido" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" -msgstr "" +msgstr "URL non valido" #: src/js/controllers/create.js:175 #: src/js/controllers/import.js:327 @@ -1397,6 +1488,7 @@ msgstr "Percorso di derivazione non valido" msgid "Invitation to share a {{appName}} Wallet" msgstr "Invito a condividere un {{appName}} portafoglio" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "" @@ -1504,10 +1596,6 @@ msgstr "" msgid "Low fees" msgstr "Commissioni basse" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "Effettuare un pagamento a" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "Ho capito" @@ -1525,7 +1613,7 @@ msgstr "Io" msgid "Meh - it's alright" msgstr "Beh - è tutto ok" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "Nota" msgid "Merchant Message" msgstr "Messaggio dal commerciante" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "Messaggio" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "Parametro mancante" @@ -1548,7 +1632,7 @@ msgstr "Parametro mancante" msgid "Missing private keys to sign" msgstr "Chiavi private per la firma mancanti" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "Altre Opzioni" @@ -1558,7 +1642,7 @@ msgstr "Altre Opzioni" msgid "Moved" msgstr "Spostato" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "Fondi trasferiti" @@ -1577,13 +1661,10 @@ msgstr "Nota: Per importare un portafoglio da un software di terze parti, si pre msgid "Name" msgstr "Nome" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "Network" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" -msgstr "" +msgstr "Commissione di rete" #: src/js/services/bwcError.js:47 msgid "Network error" @@ -1609,6 +1690,10 @@ msgstr "Prossimi passi" msgid "No Wallet" msgstr "Nessun Portafoglio" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "Nessun backup, nessun bitcoin." @@ -1625,7 +1710,7 @@ msgstr "Nessuna informazione del'hardware disponibile." msgid "No hardware wallets supported on this device" msgstr "Nessun portafoglio hardware supportato da questo dispositivo" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "Nessuna proposta in attesa" @@ -1633,7 +1718,8 @@ msgstr "Nessuna proposta in attesa" msgid "No recent transactions" msgstr "Nessuna transazione recente" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "" @@ -1649,9 +1735,11 @@ msgstr "Nessun portafoglio trovato" msgid "No wallet selected" msgstr "Nessun portafoglio selezionato" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" -msgstr "" +msgstr "Nessun portafoglio disponibile" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" @@ -1665,7 +1753,7 @@ msgstr "Normale" msgid "Not authorized" msgstr "Non autorizzato" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "Non ci sono abbastanza fondi per la commissione" @@ -1699,10 +1787,14 @@ msgstr "Notifiche" msgid "Notifications by email" msgstr "Notifiche via email" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "Notificami se confermato" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "Ora è un buon momento per effettuare un backup del tuo portafoglio. Se questo dispositivo andasse perso, sarebbe impossibile accedere ai tuoi fondi senza una copia di backup." @@ -1711,9 +1803,13 @@ 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/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "Ok" @@ -1736,7 +1832,7 @@ msgstr "Oh no!" 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:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Apri" @@ -1753,8 +1849,8 @@ msgstr "Aprire Github" msgid "Open GitHub Project" msgstr "Aprire il progetto GitHub" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Aprire Insight" @@ -1774,6 +1870,10 @@ msgstr "Apri sito" msgid "Open wallet" msgstr "Apri Portafoglio" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "Ordinare la carta BitPay" @@ -1809,6 +1909,7 @@ msgstr "Pagare 0% di tasse per trasformare bitcoin in dollari." msgid "Pay To" msgstr "Paga A" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "Pagamento Accettato" @@ -1846,9 +1947,9 @@ msgstr "Pagamento ricevuto" msgid "Payment Rejected" msgstr "Pagamento Rifiutato" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Pagamento Inviato" @@ -1869,7 +1970,7 @@ msgstr "Dettagli pagamento" msgid "Payment request" msgstr "Richiesta di pagamento" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "Proposte in attesa" @@ -1930,7 +2031,7 @@ msgstr "Preparazione indirizzi..." msgid "Preparing backup..." msgstr "Preparando il backup..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "Premi ancora per uscire" @@ -1938,6 +2039,10 @@ msgstr "Premi ancora per uscire" msgid "Priority" msgstr "Priorità" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "Chiave privata crittografata. Inserisci la password" @@ -1950,8 +2055,8 @@ msgstr "La chiave privata è crittografata, non è possibile accedere" msgid "Proposal Accepted" msgstr "Proposta accettata" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Proposta creata" @@ -1968,6 +2073,10 @@ msgstr "Proposta respinta" msgid "Proposals" msgstr "Proposte" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "Notifiche push" @@ -2006,12 +2115,16 @@ msgstr "Ulteriori informazioni" msgid "Receive" msgstr "Ricevi" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "Ricevuti" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "Fondi ricevuti" @@ -2056,8 +2169,8 @@ msgstr "Ricrea" msgid "Recreating Wallet..." msgstr "Ricreando Portafoglio..." -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "Respinto" @@ -2099,7 +2212,7 @@ msgstr "Ripeti password" msgid "Repeat the password" msgstr "Ripeti la password" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "Richiesta delle impronte digitali" @@ -2107,7 +2220,7 @@ msgstr "Richiesta delle impronte digitali" msgid "Request Specific amount" msgstr "Richiedi un importo specifico" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "Richiedere Password di spesa" @@ -2135,7 +2248,7 @@ msgstr "Riprova con fotocamera" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "Salva" @@ -2154,7 +2267,7 @@ msgstr "Scansione degli indirizzi per fondi" #: www/views/modals/fingerprintCheck.html:11 msgid "Scan again" -msgstr "" +msgstr "Ripetere la scansione" #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" @@ -2184,7 +2297,7 @@ msgstr "Ricerca transazioni" msgid "Search your currency" msgstr "Cerca la tua valuta" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "Sicurezza" @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "Seleziona un file di backup" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "Selezionare un portafoglio" @@ -2230,7 +2342,7 @@ msgstr "Invia indirizzi via Email" msgid "Send by email" msgstr "Invia via email" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "Inviata Da" @@ -2238,6 +2350,10 @@ msgstr "Inviata Da" msgid "Send max amount" msgstr "Inviare l'importo massimo" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "Inviaci invece i tuoi pareri" @@ -2265,7 +2381,7 @@ msgstr "Invio dell'importo massimo" msgid "Sending transaction" msgstr "Invio transazione" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "L'invio di {{amountStr}} dal tuo portafoglio {{name}}" @@ -2276,7 +2392,7 @@ msgstr "L'invio di {{amountStr}} dal tuo portafoglio {{name}}" msgid "Sent" msgstr "Inviato" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "Inviare Fondi" @@ -2284,6 +2400,10 @@ msgstr "Inviare Fondi" msgid "Server response could not be verified" msgstr "La risposta del server non può essere verificata" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "Servizi" @@ -2300,6 +2420,10 @@ msgstr "Registro sessione" msgid "Set up a password" msgstr "Imposta una password" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "Impostazioni" msgid "Share the love by inviting your friends." msgstr "Condividi il piacere invitando i tuoi amici." -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "Condividi questo invito con i tuoi copayers" @@ -2371,10 +2495,14 @@ msgstr "Singolo indirizzo di portafoglio" msgid "Skip" msgstr "Salta" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "Trascina" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2400,10 +2528,6 @@ msgstr "" msgid "Start sending bitcoin" msgstr "Iniziare a inviare bitcoin" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "Avvio..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "Blocco all'avvio" @@ -2420,6 +2544,7 @@ msgstr "Super Economica" msgid "Sweep" msgstr "Spazzola" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Spazzare il portafoglio di carta" @@ -2462,6 +2587,10 @@ msgstr "Termini di Utilizzo" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2556,10 +2685,6 @@ msgstr "La cronologia delle transazioni e ogni nuova transazione in entrata veng msgid "The wallet service URL" msgstr "L'URL del servizio di portafoglio" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "Non ci sono portafogli per effettuare questo pagamento" - #: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "C'è una nuova versione di {{appName}} disponibile" @@ -2583,7 +2708,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:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "Questa richiesta di pagamento in bitcoin è scaduta." @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). msgstr "Questo portafoglio non è registrato al Bitcore Wallet Service (BWS). Puoi ricrearlo dalle informazioni locali." #: www/views/modals/txp-details.html:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "Cronologia" @@ -2638,12 +2763,13 @@ msgstr "" #: src/js/services/onGoingProcess.js:48 msgid "Top up in progress..." -msgstr "" +msgstr "Ricarica in corso..." -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" -msgstr "" +msgstr "Ricaricare di {{amountStr}} sulla carta di debito ({{cardLastNumber}})" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "" msgid "Touch ID Failed" msgstr "Touch ID Fallito" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "Transazione" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,11 +2809,8 @@ msgstr "Cronologia delle transazioni" msgid "Transaction already broadcasted" msgstr "Transazione già trasmessa" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "Transazione creata" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "" @@ -2691,7 +2818,7 @@ msgstr "" msgid "Transaction initiated" msgstr "" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "Transazione non disponibile in questo momento" @@ -2700,6 +2827,10 @@ msgstr "Transazione non disponibile in questo momento" msgid "Transaction not found" msgstr "Transazione non trovata" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "Trasferisci a" @@ -2748,7 +2879,7 @@ msgstr "Limite di indirizzi non utilizzati" msgid "Update Available" msgstr "Aggiornamento Disponibile" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "Aggiornamento in attesa di proposte. Si prega di attendere" @@ -2774,7 +2905,7 @@ msgstr "Validazione della frase di recupero..." #: www/views/modals/fingerprintCheck.html:4 msgid "Verify your identity" -msgstr "" +msgstr "Verifica della tua identità" #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 @@ -2793,8 +2924,8 @@ msgstr "Mostra tutti gli indirizzi" msgid "View Terms of Service" msgstr "Visualizza i termini di servizio" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Visualizzazione della transazione su Insight" @@ -2802,7 +2933,7 @@ msgstr "Visualizzazione della transazione su Insight" msgid "View Update" msgstr "Visualizza aggiornamenti" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "Mostra su blockchain" @@ -2830,11 +2961,11 @@ msgstr "In attesa del Ledger..." msgid "Waiting for Trezor..." msgstr "In attesa del Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "In attesa di copayers" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "In attesa..." @@ -2926,7 +3057,7 @@ msgstr "Portafoglio già in Copay" msgid "Wallet created" msgstr "Portafoglio creato" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "Portafoglio incompleto e danneggiato" @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "Portafogli & integrazioni" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "Siamo sempre alla ricerca di modi per migliorare {{appName}}." msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "Siamo sempre alla ricerca di modi per migliorare {{appName}}. Come potremmo migliorare la tua esperienza?" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "Stiamo sempre cercando contributi alla traduzione! Si possono apportare correzioni o contribuire a rendere questa app disponibile nella tua lingua nativa unendo le nostre comunità su Crowdin." @@ -3093,17 +3228,21 @@ msgstr "È possibile scambiarlo con altre valute come i dollari USA, Euro o Ster msgid "You control your bitcoin." msgstr "Controlli i tuoi bitcoin." +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "Sarà necessario accedere nuovamente per riempire la vostra carta BitPay." -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 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 it at stores and ATMs worldwide." -msgstr "" +msgstr "La carta BitPay è pronta. Aggiungi fondi alla tua carta per iniziare ad usarla presso i negozi e gli sportelli automatici in tutto il mondo." #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" @@ -3113,6 +3252,10 @@ msgstr "Il tuo portafoglio bitcoin ha eseguito il backup!" msgid "Your bitcoin wallet is ready!" msgstr "Il tuo portafoglio bitcoin è pronto!" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "Vostre idee, feedback o commenti" @@ -3130,6 +3273,14 @@ msgstr "Il tuo nickname" msgid "Your password" msgstr "La tua password" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 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." @@ -3167,25 +3318,29 @@ msgstr "nome@esempio.com" msgid "preparing..." msgstr "preparazione..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "per accettare" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "a pagare" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "per inviare" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "{{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:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} verranno detratti come commissione per il network." @@ -3197,7 +3352,7 @@ msgstr "" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transazioni scaricate" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-di-{{wallet.n}}" diff --git a/i18n/po/ja.po b/i18n/po/ja.po index dfa3a42ba..f446410d1 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Japanese\n" "Language: ja\n" -"PO-Revision-Date: 2017-06-29 07:15-0400\n" +"PO-Revision-Date: 2017-07-18 13:18-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -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:347 +#: src/js/controllers/confirm.js:351 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "注意：合計{{amountAboveMaxSizeStr}} を除外しました。取引に許可される最大サイズを超えました" -#: src/js/controllers/confirm.js:341 +#: src/js/controllers/confirm.js:345 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "注意：合計 {{amountBelowFeeStr}} を除外しました。これらのビットコインは手数料よりも低い額となるため除外しました。" @@ -56,8 +56,8 @@ msgstr "注意：合計 {{amountBelowFeeStr}} を除外しました。これら msgid "About" msgstr "このアプリについて" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "承諾済" @@ -117,7 +117,11 @@ msgstr "アカウントを追加" msgid "Add an optional password to secure the recovery phrase" msgstr "フレーズを守るために任意のパスワードをかけて下さい" -#: src/js/controllers/confirm.js:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "詳細を追加" @@ -136,7 +140,6 @@ msgstr "ウォレットを追加" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "アドレス" @@ -194,10 +197,13 @@ msgstr "ほぼ完了!確認してみましょう。" msgid "Alternative Currency" msgstr "表示通貨" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "金額" @@ -205,7 +211,7 @@ msgstr "金額" msgid "Amount below minimum allowed" msgstr "送金可能最少額を下回っています" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "金額が大きすぎます" @@ -247,11 +253,11 @@ msgid "Are you sure you want to delete this wallet?" msgstr "本当にこのウォレットを削除しても\n" "宜しいですか？" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "この取引を却下してもよろしいですか?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "この取引を破棄してもよろしいですか?" @@ -280,7 +286,7 @@ msgstr "即座送金可能" msgid "Available Balance" msgstr "送金可能残高" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "平均承認時間" @@ -292,7 +298,7 @@ msgstr "平均承認時間" msgid "BIP32 path for address derivation" msgstr "階級アドレス派生のパス" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "バックアップ" @@ -304,7 +310,7 @@ msgstr "要バックアップ" msgid "Backup all livenet wallets before using this function" msgstr "この機能を使う前に必ず全てのウォレットの復元フレーズのバックアップを取って下さい！" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "要バックアップ" @@ -339,6 +345,7 @@ msgid "BitPay Visa® Cards" msgstr "BitPayのVISA® カード" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "ビットコインアドレス" @@ -348,10 +355,6 @@ msgstr "ビットコインアドレス" msgid "Bitcoin Network Fee Policy" msgstr "ビットコインネットワークの手数料設定" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "Bitcoin URI が無効です！" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Bitcoin 単位" @@ -372,12 +375,16 @@ msgstr "ビットコインは世界で
最も安全な仮想通貨。" msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "ビットコインの取引はネットワークの安全を守る「採掘者」と呼ばれる者達に送る手数料が含まれます。" +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "取引送信" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "送信済み" @@ -389,7 +396,11 @@ msgstr "取引送信中" msgid "Browser unsupported" msgstr "ブラウザ未対応" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "ビットコインの購入&売却" @@ -397,6 +408,10 @@ msgstr "ビットコインの購入&売却" msgid "Buy Bitcoin" msgstr "ビットコインを購入" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "ビットコインを購入中..." @@ -405,18 +420,24 @@ msgstr "ビットコインを購入中..." msgid "Calculating fee" msgstr "手数料計算中..." -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "キャンセル" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "招待状のキャンセル" @@ -428,7 +449,7 @@ msgstr "ウォレットを作成できません。" msgid "Cannot join the same wallet more that once" msgstr "同じ端末で同じウォレットに複数回参加することができません。" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "カード" @@ -460,12 +481,13 @@ msgstr "やり直し" msgid "Clear cache" msgstr "キャッシュを消去" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "クリックして" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -480,7 +502,7 @@ msgstr "色" msgid "Commit hash" msgstr "コミットのハッシュ値" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "この機能をご利用いただくにはバックアップを行う必要があります" @@ -488,9 +510,10 @@ msgstr "この機能をご利用いただくにはバックアップを行う必 msgid "Completed" msgstr "完了" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -503,6 +526,10 @@ msgstr "確認" msgid "Confirm & Finish" msgstr "承諾して終了する" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "確認のためPINを再入力してください" @@ -578,6 +605,9 @@ msgstr "クリップボードにコピーしました" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "このテキストを安全な場所に貼り付けて保管して下さい (メモ帳やメールの下書きなど)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -587,15 +617,19 @@ msgstr "クリップボードへコピー" msgid "Could not access the wallet at the server. Please check:" msgstr "サーバーにてウォレットの確認ができませんでした。こちらをご確認下さい:" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "ウォレットにアクセスできませんでした。" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "共有キー無しでインポートされたウォレットへのメッセージの追加ができません" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "送金を配信できませんでした。" @@ -607,11 +641,12 @@ msgstr "取引を作成できませんでした。" msgid "Could not create address" msgstr "アドレスを生成できませんでした。" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "請求を作成できませんでした" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "取引を作成できませんでした。" @@ -631,23 +666,28 @@ msgstr "作成できません：ウォレットの復元フレーズが不正で msgid "Could not decrypt file, check your password" msgstr "複合化できませんでした。パスワードが正しいかご確認下さい。" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "送金の提案を削除できませんでした" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "手数料の金額を取得できませんでした。" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "次の手数料レートを取得できませんでした: {{feeLevel}}" -#: src/js/controllers/topup.js:94 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "請求の取得ができませんでした" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "取引を取得できませんでした。" @@ -665,7 +705,7 @@ msgstr "インポートできませんでした。入力ファイルとパスワ msgid "Could not join wallet" msgstr "ウォレットに参加できませんでした。" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "送金を却下できませんでした。" @@ -682,11 +722,12 @@ msgstr "カードを削除できませんでした。" msgid "Could not save preferences on the server" msgstr "設定をサーバーと同期できませんでした。" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "送金できませんでした。" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "取引が送れませんでした" @@ -740,15 +781,23 @@ msgstr "ウォレット作成中…" msgid "Creating transaction" msgstr "取引作成中…" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "この設定の現在の手数料レート" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "金額を入力" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -767,7 +816,7 @@ msgstr "送金の提案を削除" msgid "Delete Wallet" msgstr "ウォレットを削除" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "削除して新規作成" @@ -790,6 +839,7 @@ msgstr "派生パス" msgid "Derivation Strategy" msgstr "派生パス" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" msgstr "" @@ -834,7 +884,7 @@ msgstr "編集" msgid "Email" msgstr "電子メール" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "メールアドレス" @@ -846,7 +896,7 @@ msgstr "未使用アドレスを生成しすぎたため、これ以上アドレ msgid "Enable camera access in your device settings to get started." msgstr "端末の設定でカメラの使用許可をしないとスキャンができません。" -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "メール通知を有効化" @@ -871,6 +921,10 @@ msgstr "送金時のパスワード入力して下さい。" msgid "Enter Two Factor for your BitPay account" msgstr "BitPay アカウントの2段階認証コードを入力して下さい" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "新しい送金時パスワードを入力してください" @@ -895,10 +949,12 @@ msgstr "パスワードを入力して下さい。" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -939,7 +995,8 @@ msgstr "パスワードを入力して下さい。" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -950,26 +1007,35 @@ msgstr "パスワードを入力して下さい。" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "エラー" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "確認のエラー" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "ウォレット作成時にエラー" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "全額送金データ取得時にエラー" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "支払い検証のエラー" @@ -993,7 +1059,7 @@ msgstr "デビットカードの更新エラー" msgid "Exceeded daily limit of $500 per user" msgstr "ユーザーの1日当たりの制限 500 米ドルを超えました" -#: src/js/controllers/confirm.js:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1027,8 +1093,8 @@ msgid "Extended Public Keys" msgstr "拡張公開鍵" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." -msgstr "ウォレット情報を抽出中…" +msgid "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1047,6 +1113,14 @@ msgstr "家族旅行貯金" msgid "Fee" msgstr "手数料" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1061,8 +1135,8 @@ msgid "Fetching BitPay Account..." msgstr "BitPay アカウントを取得..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" -msgstr "支払い情報要求しています…" +msgid "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 @@ -1084,6 +1158,8 @@ msgstr "完了" msgid "For audit purposes" msgstr "監査用機能" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1160,14 +1236,26 @@ msgstr "初めての連絡先を追加しましょう。" msgid "Getting fee levels..." msgstr "手数料レベルを取得しています…" -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "戻る" @@ -1200,7 +1288,7 @@ msgstr "ハードウェアウォレット" msgid "Help & Support" msgstr "ヘルプ＆サポート" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "サポートに関する情報はウェブサイトに掲載しております。" @@ -1209,7 +1297,7 @@ msgstr "サポートに関する情報はウェブサイトに掲載しており msgid "Hide" msgstr "非表示" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "残高を非表示" @@ -1284,7 +1372,7 @@ msgstr "自分のビットコインがこの端末に入っていて、外部の msgid "I've written it down" msgstr "紙に書き留めました" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "有効にした場合は、このウォレットに関連する全ての秘密情報(秘密鍵と復元フレーズ)と履歴情報(送金やエクスポート)は守られます。" @@ -1357,12 +1445,14 @@ msgstr "コードの形式が異なります" msgid "Incorrect network address" msgstr "サーバーのアドレスが不正です" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "残高不足" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "手数料付けるには残高が足りません" @@ -1371,7 +1461,8 @@ msgstr "手数料付けるには残高が足りません" msgid "Invalid" msgstr "無効" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "無効なURL" @@ -1399,6 +1490,7 @@ msgstr "無効な派生パス" msgid "Invitation to share a {{appName}} Wallet" msgstr "{{appName}} 共有ウォレットへの招待" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "" @@ -1506,10 +1598,6 @@ msgstr "少額の入力" msgid "Low fees" msgstr "低手数料" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "支払いは次の宛先へ" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "わかりました" @@ -1527,7 +1615,7 @@ msgstr "自分" msgid "Meh - it's alright" msgstr "まあまあです" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1538,10 +1626,6 @@ msgstr "メモ" msgid "Merchant Message" msgstr "お店からのメッセージ：" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "メッセージ" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "不足しているパラメータ" @@ -1550,7 +1634,7 @@ msgstr "不足しているパラメータ" msgid "Missing private keys to sign" msgstr "署名するための秘密鍵がありません。" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "その他オプション" @@ -1560,7 +1644,7 @@ msgstr "その他オプション" msgid "Moved" msgstr "移動済" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "資金を移動済み" @@ -1579,10 +1663,7 @@ msgstr "注意：他アプリのウォレットをインポートする場合、 msgid "Name" msgstr "名前" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "ネットワーク" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" msgstr "" @@ -1611,6 +1692,10 @@ msgstr "次のステップ" msgid "No Wallet" msgstr "ウォレットが無いよ…(´・ω・`)" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "バックアップは非常に重要です！" @@ -1627,7 +1712,7 @@ msgstr "ハードウェア情報はありません" msgid "No hardware wallets supported on this device" msgstr "この端末ではハードウェアウォレットがサポートされていません" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "保留中の提案はありません" @@ -1635,7 +1720,8 @@ msgstr "保留中の提案はありません" msgid "No recent transactions" msgstr "最近の取引がありません" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "提案に署名できない：秘密鍵がありません" @@ -1651,7 +1737,9 @@ msgstr "ウォレットが見つかりません" msgid "No wallet selected" msgstr "ウォレットが選択されていません" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" msgstr "" @@ -1667,7 +1755,7 @@ msgstr "通常" msgid "Not authorized" msgstr "権限がありません。" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "手数料含めたら残高が不足しています。" @@ -1701,10 +1789,14 @@ msgstr "通知設定" msgid "Notifications by email" msgstr "メール通知" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "取引承認時に通知" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "お金を受け取る前に、このウォレットのバックアップを取っておくことを強くオススメします。一ウォレットごとにバックアップは一回です。バックアップを取らないまま、この端末が紛失・故障されてしまったら全残高が消失されてしまいます。" @@ -1713,9 +1805,13 @@ msgstr "お金を受け取る前に、このウォレットのバックアップ msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "今一度周りの環境をよく見てみましょう。隠しカメラ、窓、覗いてくる人などありませんか？" -#: src/js/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "OK" @@ -1738,7 +1834,7 @@ msgstr "おっと!" msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "この画面では、全てのウォレット、アカウント、資産が閲覧できます。" -#: src/js/controllers/bitpayCard.js:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "開く" @@ -1755,8 +1851,8 @@ msgstr "GitHubを開く" msgid "Open GitHub Project" msgstr "GitHub のプロジェクトを開く" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Insightを開く" @@ -1776,6 +1872,10 @@ msgstr "サイトを開く" msgid "Open wallet" msgstr "ウォレットを開く" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "BitPay カードを申し込み" @@ -1811,6 +1911,7 @@ msgstr "0% 手数料でビットコインを米ドルに替える" msgid "Pay To" msgstr "支払い先" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "支払いが完了しました" @@ -1848,9 +1949,9 @@ msgstr "送金が受領されました" msgid "Payment Rejected" msgstr "送金が却下されました" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "送金が完了しました" @@ -1871,7 +1972,7 @@ msgstr "支払いの詳細" msgid "Payment request" msgstr "支払い請求" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "保留中の提案" @@ -1932,7 +2033,7 @@ msgstr "アドレスを処理中…" msgid "Preparing backup..." msgstr "バックアップを準備中..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "もう一度押して終了" @@ -1940,6 +2041,10 @@ msgstr "もう一度押して終了" msgid "Priority" msgstr "優先" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "秘密鍵は暗号化されています。復号化パスワードを入力して下さい。" @@ -1952,8 +2057,8 @@ msgstr "秘密鍵が暗号化されており署名できません。" msgid "Proposal Accepted" msgstr "提案が承諾されました" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "提案が作成されました" @@ -1970,6 +2075,10 @@ msgstr "提案が却下されました" msgid "Proposals" msgstr "提案" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "プッシュ通知" @@ -2008,12 +2117,16 @@ msgstr "もっと読む" msgid "Receive" msgstr "受取" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "受取済み" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "受領した資金" @@ -2058,8 +2171,8 @@ msgstr "再登録" msgid "Recreating Wallet..." msgstr "ウォレットを再作成中…" -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "却下済み" @@ -2101,7 +2214,7 @@ msgstr "パスワードを再入力" msgid "Repeat the password" msgstr "パスワードの再入力" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "指紋を要求" @@ -2109,7 +2222,7 @@ msgstr "指紋を要求" msgid "Request Specific amount" msgstr "指定金額を要求" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "送金時のパスワード入力" @@ -2137,7 +2250,7 @@ msgstr "カメラを再試行" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "保存" @@ -2186,7 +2299,7 @@ msgstr "取引を検索" msgid "Search your currency" msgstr "通貨を検索" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "セキュリティ" @@ -2195,7 +2308,6 @@ msgid "Select a backup file" msgstr "バックアップファイルを選択" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "ウォレットを選択" @@ -2232,7 +2344,7 @@ msgstr "ビットコインアドレスをメールにて共有" msgid "Send by email" msgstr "メールで送信" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "ここから送金" @@ -2240,6 +2352,10 @@ msgstr "ここから送金" msgid "Send max amount" msgstr "全残高を送金" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "代わりにフィードバックを送信" @@ -2267,7 +2383,7 @@ msgstr "全残高を送金" msgid "Sending transaction" msgstr "取引送信中" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "ウォレット {{name}} から {{amountStr}} の送金を行います。" @@ -2278,7 +2394,7 @@ msgstr "ウォレット {{name}} から {{amountStr}} の送金を行います msgid "Sent" msgstr "送金済み" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "資金を送金済み" @@ -2286,6 +2402,10 @@ msgstr "資金を送金済み" msgid "Server response could not be verified" msgstr "サーバーからの返答を検証できませんでした" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "サービス" @@ -2302,6 +2422,10 @@ msgstr "セッションのログ" msgid "Set up a password" msgstr "パスワードを設定" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2312,7 +2436,7 @@ msgstr "設定" msgid "Share the love by inviting your friends." msgstr "是非友達と共有して下さい" -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "ウォレット参加者に\n" "この招待コードを\n" @@ -2375,10 +2499,14 @@ msgstr "単一アドレスウォレット" msgid "Skip" msgstr "スキップ" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "スライドして" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2404,10 +2532,6 @@ msgstr "この入力の組み合わせを送金するために膨大なビット msgid "Start sending bitcoin" msgstr "ビットコインの送金を始めましょう" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "開始中..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "起動ロック" @@ -2424,6 +2548,7 @@ msgstr "超節約" msgid "Sweep" msgstr "全残高インポート" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "ペーパーウォレットの全残高インポート" @@ -2466,6 +2591,10 @@ msgstr "利用規約" msgid "Testnet" msgstr "テスト用ネットワーク" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2562,10 +2691,6 @@ msgstr "取引履歴は新規の取引が現れる度に端末にキャッシュ msgid "The wallet service URL" msgstr "ウォレットサービスのURL" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "送金可能なウォレットがありません" - #: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "{{appName}} の新しいバージョンがあります。" @@ -2589,7 +2714,7 @@ msgstr "このアプリは素晴らしいです!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "このアプリは、最先端のセキュリティであなたのビットコインをお守りします。" -#: src/js/controllers/confirm.js:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "ビットコインペイメントの請求期限が切れています。" @@ -2617,7 +2742,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). msgstr "現在設定中のBitcore Wallet Service (BWS) サーバーにて、このウォレットの登録がありません。再登録を行うこともできます。" #: www/views/modals/txp-details.html:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "履歴" @@ -2646,10 +2771,11 @@ msgstr "{{reason}}：その前にBitPayアカウントを追加する必要が msgid "Top up in progress..." msgstr "残高補充処理中..." -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "デビットカード ({{cardLastNumber}}) に {{amountStr}} の入金を行う" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2672,10 +2798,14 @@ msgstr "合計ウォレット入力" msgid "Touch ID Failed" msgstr "Touch ID が失敗しました。" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "取引" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2685,11 +2815,8 @@ msgstr "取引履歴" msgid "Transaction already broadcasted" msgstr "取引は既に配信されました。" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "取引情報を作成しました" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "" @@ -2697,7 +2824,7 @@ msgstr "" msgid "Transaction initiated" msgstr "取引が開始されました" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "現在この取引はご覧いただけません。" @@ -2706,6 +2833,10 @@ msgstr "現在この取引はご覧いただけません。" msgid "Transaction not found" msgstr "取引は見つかりません" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "移動先" @@ -2754,7 +2885,7 @@ msgstr "未使用アドレス生成上限" msgid "Update Available" msgstr "利用可能なアップデートあり" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "協議中の送金提案を更新します。しばらくお待ちください。" @@ -2799,8 +2930,8 @@ msgstr "全アドレスを表示" msgid "View Terms of Service" msgstr "サービス利用規約を表示" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Insightにて取引を表示" @@ -2808,7 +2939,7 @@ msgstr "Insightにて取引を表示" msgid "View Update" msgstr "更新情報を表示" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "ブロックチェーンで詳細を閲覧" @@ -2836,11 +2967,11 @@ msgstr "Ledger を待っています..." msgid "Waiting for Trezor..." msgstr "Trezor を待っています..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "ウォレット参加者を待っています" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "少々お待ち下さい…" @@ -2932,7 +3063,7 @@ msgstr "Copay内の既存のウォレットです" msgid "Wallet created" msgstr "ウォレットが作成されました" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "ウォレットが未完成で破損しています" @@ -2991,8 +3122,8 @@ msgid "Wallets & Integrations" msgstr "ウォレットと連動" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3023,6 +3154,10 @@ msgstr "弊社では、{{appName}} を改善する方法を常に探していま msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "常に{{appName}}を改善したく思っております。どのようにしたら改善できると思いますか？" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "常にボランティア翻訳者募集中です！Crowdinにてご自分の母国語の翻訳をしてこのアプリをより良いものにしてみませんか？" @@ -3099,11 +3234,15 @@ msgstr "米ドル、ユーロ、ポンドなど他の通貨との取引ができ msgid "You control your bitcoin." msgstr "ビットコインの自己管理" +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "BitPayカードに入金するためにログインする必要があります。" -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "メールアドレスにウォレットへの入金や出金に関する通知が送られます。" @@ -3119,6 +3258,10 @@ msgstr "ビットコインウォレットがバックアップされました!" msgid "Your bitcoin wallet is ready!" msgstr "ビットコインウォレットが完成しました!" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "提案、評価、コメントなど" @@ -3136,6 +3279,14 @@ msgstr "自分のハンドルネーム" msgid "Your password" msgstr "パスワード" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "ウォレットは一度もクラウドへ保存されたりすることはありませんし、携帯電話などに付いている標準バックアップ機能ではバックアップされません！！！！" @@ -3173,25 +3324,29 @@ msgstr "name@example.com" msgid "preparing..." msgstr "準備中..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "承諾する" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "支払う" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "送金する" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "{{appName}}はブロックチェーンの情報を取得したり参加者を同期させたりするためにBitcore Wallet Service (BWS)に依存します。初期値としてBitPay社が提供する https://bws.bitpay.com (BitPay公式のBWSサーバー)を設定していますが、独自で運用してウォレットをそちらに接続しても構いません。" -#: src/js/controllers/confirm.js:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} のビットコインネットワーク手数料が差し引かれます。" @@ -3203,7 +3358,7 @@ msgstr "送金額に対する {{tx.txp[wallet.id].feeRatePerStr}}" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} 個の取引ダウンロード済み" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-of-{{wallet.n}}" diff --git a/i18n/po/pl.po b/i18n/po/pl.po index be0328bf7..8e8b645af 100644 --- a/i18n/po/pl.po +++ b/i18n/po/pl.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Polish\n" "Language: pl\n" -"PO-Revision-Date: 2017-06-29 07:15-0400\n" +"PO-Revision-Date: 2017-07-18 13:18-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -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:347 +#: src/js/controllers/confirm.js:351 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:341 +#: src/js/controllers/confirm.js:345 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." @@ -56,8 +56,8 @@ msgstr "Uwaga: łącznie kwota {{amountBelowFeeStr}} została wyłączona. Środ msgid "About" msgstr "O programie" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "Zatwierdzono" @@ -117,17 +117,21 @@ 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:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "Dodaj opis" #: www/views/topup.html:6 msgid "Add funds" -msgstr "" +msgstr "Dodaj fundusze" #: src/js/services/bitpayAccountService.js:78 msgid "Add this BitPay account ({{email}})?" -msgstr "" +msgstr "Dodać to konto BitPay ({{email}})?" #: www/views/add.html:3 msgid "Add wallet" @@ -136,7 +140,6 @@ msgstr "Dodaj portfel" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "Adres" @@ -194,10 +197,13 @@ msgstr "Prawie gotowe! Dokonajmy przeglądu." msgid "Alternative Currency" msgstr "Alternatywna waluta" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "Kwota" @@ -205,13 +211,13 @@ msgstr "Kwota" msgid "Amount below minimum allowed" msgstr "Kwota poniżej minimum dozwolona" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "Zbyt duża kwota" #: www/views/includes/walletHistory.html:31 msgid "Amount too low to spend" -msgstr "" +msgstr "Zbyt niska kwota do wysłania" #: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." @@ -245,11 +251,11 @@ msgstr "" msgid "Are you sure you want to delete this wallet?" msgstr "Czy na pewno chcesz usunąć ten portfel?" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "Czy na pewno chcesz odrzucić tę transakcję?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "Czy na pewno chcesz usunąć tę transakcję?" @@ -278,7 +284,7 @@ msgstr "Dostępne" msgid "Available Balance" msgstr "Dostępne saldo" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "Spodziewany czas potwierdzania" @@ -290,7 +296,7 @@ msgstr "Spodziewany czas potwierdzania" msgid "BIP32 path for address derivation" msgstr "BIP32 ścieżka dla adresu derywacji" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "Kopia zapasowa" @@ -302,7 +308,7 @@ msgstr "Potrzebna kopia zapasowa" msgid "Backup all livenet wallets before using this function" msgstr "Zrób kopię zapasową wszystkich swoich portfeli przed użyciem tej funkcji" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "Potrzebna kopia zapasowa" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "Karty BitPay Visa®" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "Adres bitcoin" @@ -346,10 +353,6 @@ msgstr "Adres bitcoin" msgid "Bitcoin Network Fee Policy" msgstr "Polityka prowizji sieci bitcoin" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "Bitcoin URI jest nieprawidłowy!" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Jednostki bitcoina" @@ -370,12 +373,16 @@ msgstr "Bitcoin jest bezpieczny,
cyfrowe pieniądze." msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "Transakcje Bitcoin obejmują prowizję pobieraną przez górników w sieci." +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "Przekaż płatność" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "Nadawane" @@ -387,7 +394,11 @@ msgstr "Przekazywanie transakcji" msgid "Browser unsupported" msgstr "Przeglądarka nieobsługiwana" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "Kup & sprzedaj bitcoiny" @@ -395,6 +406,10 @@ msgstr "Kup & sprzedaj bitcoiny" msgid "Buy Bitcoin" msgstr "Kup bitcoiny" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "Zakup bitcoinów..." @@ -403,20 +418,26 @@ msgstr "Zakup bitcoinów..." msgid "Calculating fee" msgstr "Obliczanie prowizji" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "Anuluj" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" -msgstr "" +msgstr "Anuluj zaproszenie" #: src/js/controllers/onboarding/tour.js:52 msgid "Cannot Create Wallet" @@ -426,7 +447,7 @@ msgstr "Nie można utworzyć portfela" msgid "Cannot join the same wallet more that once" msgstr "Nie można dołączyć tego samego portfela więcej niż raz" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "Karty" @@ -458,12 +479,13 @@ msgstr "Wyczyść" msgid "Clear cache" msgstr "Wyczyść pamięć podręczną" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "Kliknij" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,17 +500,18 @@ msgstr "Kolor" msgid "Commit hash" msgstr "Zatwierdzony hash" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 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:93 msgid "Completed" -msgstr "" +msgstr "Zakończono" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "Potwierdź" msgid "Confirm & Finish" msgstr "Potwierdź & zakończenie" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "Potwierdź kod PIN" @@ -576,6 +603,9 @@ msgstr "Skopiowano do schowka" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Skopiuj ten tekst w bezpiecznym miejscu (notatnik lub e-mail)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "Skopiuj do schowka" msgid "Could not access the wallet at the server. Please check:" msgstr "Nie można uzyskać dostępu do portfela na serwerze. Proszę sprawdzić:" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "Nie można uzyskać dostępu do portfela" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 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" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "Wypłata nie może zostać wysłana" @@ -605,13 +639,14 @@ msgstr "Nie udało się utworzyć transakcji" msgid "Could not create address" msgstr "Nie można utworzyć adresu" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" -msgstr "" +msgstr "Nie można utworzyć transakcji" #: src/js/services/profileService.js:342 msgid "Could not create using the specified extended private key" @@ -629,23 +664,28 @@ msgstr "Nie można utworzyć: niepoprawna kluczowa fraza" msgid "Could not decrypt file, check your password" msgstr "Nie można odszyfrować pliku, sprawdź hasło" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "Nie można usunąć wniosku wypłaty" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "Nie można pobrać dynamicznej prowizji" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 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 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "Nie można pobrać transakcji" @@ -663,7 +703,7 @@ msgstr "Nie można zaimportować. Sprawdź plik wejściowy i hasło" msgid "Could not join wallet" msgstr "Nie można dołączyć portfela" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "Wypłata nie może być odrzucona" @@ -680,13 +720,14 @@ msgstr "Nie można usunąć karty" msgid "Could not save preferences on the server" msgstr "Nie można zapisać ustawień na serwerze" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "Wypłata nie może zostać wysłana" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" -msgstr "" +msgstr "Nie można wysłać transakcji" #: www/views/walletDetails.html:199 msgid "Could not update transaction history" @@ -738,15 +779,23 @@ msgstr "Tworzenie portfela..." msgid "Creating transaction" msgstr "Tworzenie transakcji" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "Aktualna stawka prowizji dla tej polityki" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "Kwota własna" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "Usuń wniosek wypłaty" msgid "Delete Wallet" msgstr "Usuń portfel" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "Usuń i utwórz nowy portfel" @@ -788,9 +837,10 @@ msgstr "Ścieżka derywacji" msgid "Derivation Strategy" msgstr "Strategia derywacji" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" -msgstr "" +msgstr "Szczegóły" #: src/js/controllers/lockSetup.js:9 #: src/js/controllers/tab-settings.js:60 @@ -825,14 +875,14 @@ msgstr "Ekonomiczna" #: www/views/onboarding/collectEmail.html:27 msgid "Edit" -msgstr "" +msgstr "Edytuj" #: www/views/addressbook.add.html:29 #: www/views/addressbook.view.html:22 msgid "Email" msgstr "E-mail" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "Adres e-mail" @@ -844,7 +894,7 @@ msgstr "Puste adresy osiągnęły limit. Nowe adresy nie mogą być generowane." msgid "Enable camera access in your device settings to get started." msgstr "Udostępnij kamerę w ustawieniach urządzenia, aby rozpocząć pracę." -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "Włącz powiadomienia e-mail" @@ -869,6 +919,10 @@ msgstr "Wprowadź hasło wypłaty" msgid "Enter Two Factor for your BitPay account" msgstr "Wprowadź podwójne uwierzytelnienie swojego konta BitPay" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Wprowadź nowe hasło wypłaty" @@ -881,7 +935,7 @@ msgstr "Wprowadź kluczową frazę (BIP39)" #: www/views/onboarding/collectEmail.html:13 msgid "Enter your email" -msgstr "" +msgstr "Wpisz swój adres e-mail" #: www/views/backup.html:62 msgid "Enter your password" @@ -893,10 +947,12 @@ msgstr "Wprowadź hasło" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "Wprowadź hasło" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,32 +1005,41 @@ msgstr "Wprowadź hasło" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Błąd" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "Błąd w potwierdzeniu" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "Błąd podczas tworzenia portfela" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" -msgstr "" +msgstr "Wystąpił błąd podczas uzyskiwania informacji SendMax" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" -msgstr "" +msgstr "Błąd w protokole płatności" #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" -msgstr "" +msgstr "Błąd parowania konta Bitpay" #: src/js/controllers/paperWallet.js:41 msgid "Error scanning funds:" @@ -991,7 +1057,7 @@ 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:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,8 +1091,8 @@ msgid "Extended Public Keys" msgstr "Rozszerzone klucze publiczne" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." -msgstr "Wyodrębnianie danych z portfela..." +msgid "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1045,10 +1111,18 @@ msgstr "Środki na rodzinne wakacje" msgid "Fee" msgstr "Prowizja" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" -msgstr "" +msgstr "Prowizja:" #: src/js/controllers/feedback/send.js:23 msgid "Feedback could not be submitted. Please try again later." @@ -1059,8 +1133,8 @@ msgid "Fetching BitPay Account..." msgstr "Odzyskiwanie konta BitPay..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" -msgstr "Pobieranie informacji o płatności" +msgid "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 @@ -1082,6 +1156,8 @@ msgstr "Zakończ" msgid "For audit purposes" msgstr "Do celów audytu" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1095,7 +1171,7 @@ msgstr "Z konta BitPay" #: www/views/tab-import-phrase.html:54 msgid "From Hardware Wallet" -msgstr "" +msgstr "Z portfela sprzętowego" #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" @@ -1111,7 +1187,7 @@ msgstr "Znaleziono środki:" #: www/views/topup.html:49 msgid "Funds to be added" -msgstr "" +msgstr "Środki, które zostaną dodane" #: www/views/paperWallet.html:53 msgid "Funds transferred" @@ -1119,7 +1195,7 @@ msgstr "Środki przelewane" #: www/views/topup.html:103 msgid "Funds were added to debit card" -msgstr "" +msgstr "Fundusze zostały dodane do karty debetowej" #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" @@ -1127,7 +1203,7 @@ msgstr "Środki będą przekazane do" #: www/views/tab-receive.html:51 msgid "Generate new address" -msgstr "" +msgstr "Generuj nowy adres" #: src/js/services/onGoingProcess.js:22 msgid "Generating .csv file..." @@ -1158,14 +1234,26 @@ msgstr "Zacznij dodając swój pierwszy kontakt." msgid "Getting fee levels..." msgstr "Uzyskiwanie informacji o prowizji..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "Powrót" @@ -1198,7 +1286,7 @@ msgstr "Portfel sprzętowy" msgid "Help & Support" msgstr "Centrum pomocy" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: 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." @@ -1207,7 +1295,7 @@ msgstr "Informacja o pomocy i wsparciu technicznym jest dostępna na stronie int msgid "Hide" msgstr "Ukryj" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "Ukryj środki" @@ -1282,7 +1370,7 @@ msgstr "Rozumiem, że moje środki są bezpieczne na tym urządzeniu i nie znajd msgid "I've written it down" msgstr "Zapisałem to" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "Jeśli opcja jest włączona, wszystkie poufne informacje (klucz prywatny i kluczowa fraza) oraz operacje (wydatki i eksport) związane z tym portfelem będą chronione." @@ -1353,14 +1441,16 @@ msgstr "Niepoprawny format kodu" #: src/js/services/bwcError.js:113 msgid "Incorrect network address" -msgstr "" +msgstr "Nieprawidłowy adres" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 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/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Niewystarczające środki na prowizję" @@ -1369,9 +1459,10 @@ msgstr "Niewystarczające środki na prowizję" msgid "Invalid" msgstr "Nieprawidłowy" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" -msgstr "" +msgstr "Nieprawidłowy adres URL" #: src/js/controllers/create.js:175 #: src/js/controllers/import.js:327 @@ -1397,6 +1488,7 @@ msgstr "Nieprawidłowa ścieżka derywacji" msgid "Invitation to share a {{appName}} Wallet" msgstr "Zaproszenie do współdzielenia portfela {{appName}}" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "" @@ -1494,7 +1586,7 @@ msgstr "Skuteczna blokada. Proszę czekać, aby usunąć wniosek wypłaty" #: www/views/modals/bitpay-card-confirmation.html:14 msgid "Log out" -msgstr "" +msgstr "Wyloguj się" #: www/views/addresses.html:87 msgid "Low amount inputs" @@ -1504,10 +1596,6 @@ msgstr "" msgid "Low fees" msgstr "Niskie opłaty" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "Wypłać do" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "Brzmi sensownie" @@ -1525,7 +1613,7 @@ msgstr "Ja" msgid "Meh - it's alright" msgstr "Spoko - może być" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "Notatka" msgid "Merchant Message" msgstr "Wiadomość handlowa" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "Wiadomość" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "Brak parametru" @@ -1548,7 +1632,7 @@ msgstr "Brak parametru" msgid "Missing private keys to sign" msgstr "Brak kluczy prywatnych do podpisania" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "Więcej opcji" @@ -1558,7 +1642,7 @@ msgstr "Więcej opcji" msgid "Moved" msgstr "Przeniesiony" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "Przesuń środki" @@ -1577,13 +1661,10 @@ msgstr "Uwaga: Aby zaimportować portfel z oprogramowania innego niż Copay, prz msgid "Name" msgstr "Nazwa" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "Sieć" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" -msgstr "" +msgstr "Prowizja za użytkowanie sieci" #: src/js/services/bwcError.js:47 msgid "Network error" @@ -1609,6 +1690,10 @@ msgstr "Kolejne kroki" msgid "No Wallet" msgstr "Brak portfela" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "Nie ma kopii zapasowej - nie ma bitcoinów." @@ -1625,7 +1710,7 @@ msgstr "Brak dostępnych informacji o sprzęcie." msgid "No hardware wallets supported on this device" msgstr "Portfele sprzętowe nie są obsługiwane przez to urządzenie" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "Brak propozycji płatności" @@ -1633,7 +1718,8 @@ msgstr "Brak propozycji płatności" msgid "No recent transactions" msgstr "Brak wcześniejszych transakcji" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "" @@ -1649,9 +1735,11 @@ msgstr "Nie znaleziono portfela" msgid "No wallet selected" msgstr "Nie wybrano portfela" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" -msgstr "" +msgstr "Brak dostępnych portfeli" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" @@ -1665,7 +1753,7 @@ msgstr "Zwykła" msgid "Not authorized" msgstr "Brak autoryzacji" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "Brak środków na opłacenie prowizji" @@ -1697,10 +1785,14 @@ msgstr "Powiadomienia" #: www/views/onboarding/collectEmail.html:9 msgid "Notifications by email" -msgstr "" +msgstr "Powiadomienia e-mail" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" +msgstr "Powiadom mnie, jeśli potwierdzono" + +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" msgstr "" #: www/views/includes/backupNeededPopup.html:8 @@ -1711,9 +1803,13 @@ 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/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "OK" @@ -1736,7 +1832,7 @@ msgstr "O nie!" 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:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Otwórz" @@ -1753,8 +1849,8 @@ msgstr "Otwórz GitHub" msgid "Open GitHub Project" msgstr "Otwórz projekt GitHub" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Otwórz Insight" @@ -1774,6 +1870,10 @@ msgstr "Otwórz stronę internetową" msgid "Open wallet" msgstr "Otwórz portfel" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "Zamów kartę BitPay" @@ -1809,6 +1909,7 @@ msgstr "Zapłać 0% prowizji za wymianę bitcoinów na dolary." msgid "Pay To" msgstr "Zapłać" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "Wypłata zaakceptowana" @@ -1846,9 +1947,9 @@ msgstr "Płatność otrzymana" msgid "Payment Rejected" msgstr "Wypłata odrzucona" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Płatność wysłana" @@ -1869,7 +1970,7 @@ msgstr "Szczegóły wypłaty" msgid "Payment request" msgstr "Wniosek o płatność" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "Rozpatrywane płatności" @@ -1930,7 +2031,7 @@ msgstr "Przygotowywanie adresów..." msgid "Preparing backup..." msgstr "Przygotowywanie kopii zapasowej..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "Naciśnij ponownie, aby wyjść" @@ -1938,6 +2039,10 @@ msgstr "Naciśnij ponownie, aby wyjść" msgid "Priority" msgstr "Priorytetowa" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "Klucz prywatny jest zaszyfrowany. Wprowadź hasło" @@ -1950,8 +2055,8 @@ msgstr "Klucz prywatny jest zaszyfrowany, nie można podpisać" msgid "Proposal Accepted" msgstr "Płatność przyjęta" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Płatność utworzona" @@ -1968,6 +2073,10 @@ msgstr "Płatność odrzucona" msgid "Proposals" msgstr "Proponowane płatności" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "Wyskakujące powiadomienia" @@ -2006,12 +2115,16 @@ msgstr "Zobacz więcej" msgid "Receive" msgstr "Otrzymaj" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "Otrzymane" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "Otrzymane środki" @@ -2056,8 +2169,8 @@ msgstr "Przywróć" msgid "Recreating Wallet..." msgstr "Przywracanie portfela..." -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "Odrzucono" @@ -2071,7 +2184,7 @@ msgstr "Informacje o wersji" #: www/views/addressbook.view.html:36 msgid "Remove" -msgstr "" +msgstr "Usuń" #: src/js/controllers/preferencesBitpayServices.js:7 msgid "Remove BitPay Account?" @@ -2099,7 +2212,7 @@ msgstr "Powtórz hasło" msgid "Repeat the password" msgstr "Powtórz hasło" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "Zapytaj o odcisk palca" @@ -2107,7 +2220,7 @@ msgstr "Zapytaj o odcisk palca" msgid "Request Specific amount" msgstr "Prośba o konkretną kwotę" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "Wprowadź hasło wypłaty" @@ -2135,7 +2248,7 @@ msgstr "Spróbuj ponownie z aparatem" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "Zapisz" @@ -2154,7 +2267,7 @@ msgstr "Skanuj adresy w celu znalezienia środków" #: www/views/modals/fingerprintCheck.html:11 msgid "Scan again" -msgstr "" +msgstr "Skanuj ponownie" #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" @@ -2184,7 +2297,7 @@ msgstr "Szukaj transakcji" msgid "Search your currency" msgstr "Znajdź swoją walutę" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "Bezpieczeństwo" @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "Wybierz plik kopii zapasowej" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "Wybierz portfel" @@ -2230,7 +2342,7 @@ msgstr "Wyślij adresy przez e-mail" msgid "Send by email" msgstr "Wyślij przez e-mail" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "Wyślij z" @@ -2238,6 +2350,10 @@ msgstr "Wyślij z" msgid "Send max amount" msgstr "Wyślij całą kwotę" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "Zamiast tego wyślij nam swoją opinię" @@ -2265,7 +2381,7 @@ msgstr "Wysyłanie całej kwoty" msgid "Sending transaction" msgstr "Wysyłanie transakcji" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Wysyłanie {{amountStr}} z twojego portfela {{name}}" @@ -2276,7 +2392,7 @@ msgstr "Wysyłanie {{amountStr}} z twojego portfela {{name}}" msgid "Sent" msgstr "Wysłane" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "Wysłane środki" @@ -2284,6 +2400,10 @@ msgstr "Wysłane środki" msgid "Server response could not be verified" msgstr "Odpowiedź serwera nie mogła zostać zweryfikowana" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "Usługi" @@ -2300,6 +2420,10 @@ msgstr "Dziennik sesji" msgid "Set up a password" msgstr "Ustal hasło" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "Ustawienia" msgid "Share the love by inviting your friends." msgstr "Podziel się miłością, zapraszając swoich przyjaciół." -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "Wyślij zaproszenie współwłaścicielom portfela" @@ -2371,10 +2495,14 @@ msgstr "Pojedynczy adres portfela" msgid "Skip" msgstr "Pomiń" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "Przesuń" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2400,17 +2528,13 @@ msgstr "" msgid "Start sending bitcoin" msgstr "Zacznij wysyłać bitcoiny" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "Rozpoczynanie..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "Blokada uruchamiania" #: www/views/topup.html:101 msgid "Success" -msgstr "" +msgstr "Udało się" #: src/js/services/feeService.js:14 msgid "Super Economy" @@ -2420,6 +2544,7 @@ msgstr "Super Ekonomiczna" msgid "Sweep" msgstr "Opróżnij" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Wyczyść papierowy portfel" @@ -2462,6 +2587,10 @@ msgstr "Warunki użytkowania" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2556,10 +2685,6 @@ msgstr "Historia transakcji i każda nowoprzychodząca transakcja są zapisywane msgid "The wallet service URL" msgstr "Adres URL usługi portfela" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "Brak portfela, aby dokonać tej wypłaty" - #: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Dostępna jest nowa wersja {{appName}}" @@ -2583,7 +2708,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:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "Ten wniosek płatności wygasł." @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). 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:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "Historia" @@ -2640,10 +2765,11 @@ msgstr "" msgid "Top up in progress..." msgstr "" -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "" msgid "Touch ID Failed" msgstr "Odczyt Touch ID nie powiódł się" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "Transakcja" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,11 +2809,8 @@ msgstr "Historia transakcji" msgid "Transaction already broadcasted" msgstr "Transakcja została już wysłana" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "Transakcja utworzona" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "" @@ -2691,7 +2818,7 @@ msgstr "" msgid "Transaction initiated" msgstr "" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "Transakcja w tej chwili niedostępna" @@ -2700,9 +2827,13 @@ msgstr "Transakcja w tej chwili niedostępna" msgid "Transaction not found" msgstr "Nie znaleziono transakcji" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" -msgstr "" +msgstr "Przekaż do" #: www/views/tab-send.html:67 msgid "Transfer to Wallet" @@ -2748,7 +2879,7 @@ msgstr "Limit nieużywanych adresów" msgid "Update Available" msgstr "Dostępna aktualizacja" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "Aktualizacja wniosków płatności. Proszę czekać" @@ -2774,7 +2905,7 @@ msgstr "Sprawdzanie poprawności kluczowej frazy..." #: www/views/modals/fingerprintCheck.html:4 msgid "Verify your identity" -msgstr "" +msgstr "Weryfikacja konta użytkownika" #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 @@ -2793,8 +2924,8 @@ msgstr "Zobacz wszystkie adresy" msgid "View Terms of Service" msgstr "Zobacz zasady użytkowania" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Zobacz transakcje na Insight" @@ -2802,7 +2933,7 @@ msgstr "Zobacz transakcje na Insight" msgid "View Update" msgstr "Zobacz aktualizacje" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "Zobacz na blockchainie" @@ -2830,11 +2961,11 @@ msgstr "Oczekiwanie na Ledger..." msgid "Waiting for Trezor..." msgstr "Oczekiwanie na Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "Oczekiwanie na współwłaścicieli portfela" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "Oczekiwanie..." @@ -2926,7 +3057,7 @@ msgstr "Portfel jest już w Copay" msgid "Wallet created" msgstr "Portfel został utworzony" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "Portfel niekompletny lub uszkodzony" @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "Portfele i integracja" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "Zawsze szukamy sposobów na poprawę {{appName}}." msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "Zawsze szukamy sposobów na ulepszenie {{appName}}. Co Twoim zdaniem można jeszcze poprawić?" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "Cały czas szukamy osób, które chciałyby przyłączyć się do tłumaczenia! Możesz dokonać korekt lub pomóc, aby aplikacja była dostępna w Twoim języku ojczystym przez dołączenie do naszej społeczności na Crowdin." @@ -3093,11 +3228,15 @@ msgstr "Możesz je wymienić na inne waluty, takie jak dolary amerykańskie, eur msgid "You control your bitcoin." msgstr "Ty kontrolujesz swoje bitcoiny." +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "" -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "Będziesz otrzymywać powiadomienia e-mail o płatności wysyłanych i odbieranych ze swoich portfeli." @@ -3113,6 +3252,10 @@ msgstr "Kopia zapasowa portfela została utworzona!" msgid "Your bitcoin wallet is ready!" msgstr "Twój portfel jest gotowy!" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "Twoje pomysły, opinie lub komentarze" @@ -3130,6 +3273,14 @@ msgstr "Twój nick" msgid "Your password" msgstr "Twoje hasło" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 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." @@ -3167,25 +3318,29 @@ msgstr "nazwa@przyklad.com" msgid "preparing..." msgstr "Przygotowywanie..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "do akceptacji" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "do zapłaty" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "do wysłania" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "{{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:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} zostanie potrącone jako prowizja sieci bitcoin." @@ -3197,7 +3352,7 @@ msgstr "" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} transakcje pobrane" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-z-{{wallet.n}}" diff --git a/i18n/po/pt.po b/i18n/po/pt.po index 251749d4d..7548a4c3a 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" -"PO-Revision-Date: 2017-06-29 08:05-0400\n" +"PO-Revision-Date: 2017-07-18 13:18-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -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:347 +#: src/js/controllers/confirm.js:351 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:341 +#: src/js/controllers/confirm.js:345 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." @@ -56,8 +56,8 @@ msgstr "O montante de {{amountBelowFeeStr}} foi excluido. Estes fundos vieram de msgid "About" msgstr "Sobre" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "Aceite" @@ -117,13 +117,17 @@ 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:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "Adicionar descrição" #: www/views/topup.html:6 msgid "Add funds" -msgstr "" +msgstr "Adicionar fundos" #: src/js/services/bitpayAccountService.js:78 msgid "Add this BitPay account ({{email}})?" @@ -136,7 +140,6 @@ msgstr "Adicionar carteira" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "Endereço" @@ -194,10 +197,13 @@ msgstr "Quase pronto! Vamos rever." msgid "Alternative Currency" msgstr "Moeda Alternativa" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "Valor" @@ -205,7 +211,7 @@ msgstr "Valor" msgid "Amount below minimum allowed" msgstr "Montante abaixo do mínimo permitido" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "Montante muito grande" @@ -245,11 +251,11 @@ msgstr "Tem certeza que deseja excluir este contato?" msgid "Are you sure you want to delete this wallet?" msgstr "Tem certeza que deseja excluir esta carteira?" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "Tem certeza que deseja cancelar esta transação?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "Tem certeza que deseja remover esta transação?" @@ -278,7 +284,7 @@ msgstr "Disponível" msgid "Available Balance" msgstr "Saldo Disponível" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "Tempo de confirmação (em média)" @@ -290,7 +296,7 @@ msgstr "Tempo de confirmação (em média)" msgid "BIP32 path for address derivation" msgstr "Pacote BIP32 para endereço de derivação" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "Backup" @@ -302,7 +308,7 @@ msgstr "Cópia de segurança necessária" msgid "Backup all livenet wallets before using this function" msgstr "Faça backup de todas as carteiras do livenet antes de usar esta função" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "Backup necessário" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "Cartões BitPay Visa®" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "Endereço Bitcoin" @@ -346,10 +353,6 @@ msgstr "Endereço Bitcoin" msgid "Bitcoin Network Fee Policy" msgstr "Política de taxa de rede Bitcoin" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "Bitcoin URI não é válido!" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Unidade do Bitcoin" @@ -370,12 +373,16 @@ msgstr "Bitcoin é seguro,
moeda digital." msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "As transações Bitcoin incluem uma taxa cobrada pelos mineiros na rede." +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "Transmitir Pagamento" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "Transmitido" @@ -387,7 +394,11 @@ msgstr "Transmitindo transação" msgid "Browser unsupported" msgstr "Navegador não suportado" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "Comprar & Vender Bitcoin" @@ -395,6 +406,10 @@ msgstr "Comprar & Vender Bitcoin" msgid "Buy Bitcoin" msgstr "Comprar Bitcoin" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "A comprar Bitcoin..." @@ -403,18 +418,24 @@ msgstr "A comprar Bitcoin..." msgid "Calculating fee" msgstr "A calcular taxa" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "Cancelar" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "Cancelar convite" @@ -426,7 +447,7 @@ msgstr "Não é possível criar a carteira" msgid "Cannot join the same wallet more that once" msgstr "Não pode juntar-se a mesma carteira mais que uma vez" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "Cartões" @@ -458,12 +479,13 @@ msgstr "Eliminar" msgid "Clear cache" msgstr "Limpar cache" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "Clique" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,7 +500,7 @@ msgstr "Cor" msgid "Commit hash" msgstr "Commit de hash" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "Complete o processo de backup para usar esta opção" @@ -486,9 +508,10 @@ msgstr "Complete o processo de backup para usar esta opção" msgid "Completed" msgstr "Concluído" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "Confirmar" msgid "Confirm & Finish" msgstr "Confirmar & Terminado" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "Confirme o seu PIN" @@ -576,6 +603,9 @@ msgstr "Copiado para a área de transferência" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Copie este texto como está para um lugar seguro (bloco de notas ou e-mail)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "Copiar para área de transferência" msgid "Could not access the wallet at the server. Please check:" msgstr "Não foi possível acessar a carteira no servidor. Por favor, verifique:" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "Impossível aceder à carteira" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 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" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "Não foi possível transmitir o pagamento" @@ -605,11 +639,12 @@ msgstr "Não foi possível criar a transacção" msgid "Could not create address" msgstr "Não foi possível criar o endereço" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "Não foi possível criar a fatura" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "Não foi possível criar a transação" @@ -629,23 +664,28 @@ msgstr "Não foi possível criar: Frase de recuperação de carteira inválida" msgid "Could not decrypt file, check your password" msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "Não foi possível excluir a proposta de pagamento" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "Não foi possível obter taxa dinâmica" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 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 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "Não foi possível obter a fatura" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "Não foi possível obter o histórico das transações" @@ -663,7 +703,7 @@ msgstr "Não foi possível importar. Verifique o arquivo de entrada e senha de c msgid "Could not join wallet" msgstr "Impossível juntar à carteira" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "Não foi possível rejeitar o pagamento" @@ -680,11 +720,12 @@ msgstr "Não foi possível remover o cartão" msgid "Could not save preferences on the server" msgstr "Não foi possível guardar as suas preferências no servidor" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "Não foi possível enviar o pagamento" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "Não foi possível enviar a transação" @@ -738,15 +779,23 @@ msgstr "Criando Carteira…" msgid "Creating transaction" msgstr "Criando transação" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "Taxa atual para esta política" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "Montante personalizado" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "Excluir Proposta de Pagamento" msgid "Delete Wallet" msgstr "Excluir Carteira" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "Apagar e criar um novo" @@ -788,9 +837,10 @@ msgstr "Caminho de derivação" msgid "Derivation Strategy" msgstr "Estratégia de derivação" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" -msgstr "" +msgstr "Detalhes" #: src/js/controllers/lockSetup.js:9 #: src/js/controllers/tab-settings.js:60 @@ -832,7 +882,7 @@ msgstr "Editar" msgid "Email" msgstr "Email" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "Endereço de email" @@ -844,7 +894,7 @@ msgstr "Limite de endereços vazios atingido. Novos endereço não podem ser ger msgid "Enable camera access in your device settings to get started." msgstr "Permita o acesso de câmera nas configurações do seu dispositivo para começar." -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "Ativar notificações por email" @@ -869,6 +919,10 @@ msgstr "Inserir senha de compra" msgid "Enter Two Factor for your BitPay account" msgstr "Insira verificação dois passos para sua conta BitPay" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Insira a nova senha para pagamento" @@ -893,10 +947,12 @@ msgstr "Digite sua senha" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "Digite sua senha" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,26 +1005,35 @@ msgstr "Digite sua senha" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Erro" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "Erro na confirmação" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "Erro na criação da carteira" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "Erro ao obter informações de SendMax" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "Erro no Protocolo de Pagamento" @@ -991,7 +1057,7 @@ 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:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,8 +1091,8 @@ msgid "Extended Public Keys" msgstr "Chave Pública Estendida" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." -msgstr "Extraindo informações da Carteira..." +msgid "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1045,6 +1111,14 @@ msgstr "Fundos de férias com a família" msgid "Fee" msgstr "Taxa" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1059,8 +1133,8 @@ msgid "Fetching BitPay Account..." msgstr "Buscando Conta BitPay..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" -msgstr "Buscando Informação de Pagamento" +msgid "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 @@ -1082,6 +1156,8 @@ msgstr "Encerrar" msgid "For audit purposes" msgstr "Para fins de auditoria" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1111,7 +1187,7 @@ msgstr "Saldos encontrados:" #: www/views/topup.html:49 msgid "Funds to be added" -msgstr "" +msgstr "Fundos a ser adicionado" #: www/views/paperWallet.html:53 msgid "Funds transferred" @@ -1158,14 +1234,26 @@ msgstr "Comece adicionando o primeiro." msgid "Getting fee levels..." msgstr "Obtendo níveis de taxa..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "Retroceder" @@ -1198,7 +1286,7 @@ msgstr "Carteira de hardware" msgid "Help & Support" msgstr "Ajuda e suporte" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: 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." @@ -1207,7 +1295,7 @@ msgstr "Informações de Ajuda e Suporte estão disponíveis no site." msgid "Hide" msgstr "Esconder" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "Esconder saldos" @@ -1282,7 +1370,7 @@ msgstr "Eu entendi que meu saldo são mantidos em segurança neste dispositivo e msgid "I've written it down" msgstr "Já escrevi isso" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "Se habilitado, todas as informações sensíveis (chave privada e frase de recuperação) e ações (gastos e exportações) associados à essa carteira será protegido." @@ -1355,12 +1443,14 @@ msgstr "Formato de código incorreto" msgid "Incorrect network address" msgstr "Endereço de rede incorreto" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "Fundos insuficientes" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Fundos insuficientes para taxa" @@ -1369,7 +1459,8 @@ msgstr "Fundos insuficientes para taxa" msgid "Invalid" msgstr "Inválido" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "URL inválida" @@ -1397,9 +1488,10 @@ msgstr "Caminho de derivação inválido" msgid "Invitation to share a {{appName}} Wallet" msgstr "Convite para compartilhar a Carteira {{appName}}" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" -msgstr "" +msgstr "Taxa de Fatura" #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" @@ -1504,10 +1596,6 @@ msgstr "Quantidade de entrada baixa" msgid "Low fees" msgstr "Baixas taxas" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "Fazer um pagamento para" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "Faz sentido" @@ -1525,7 +1613,7 @@ msgstr "Eu" msgid "Meh - it's alright" msgstr "Meh - está tudo bem" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "Nota" msgid "Merchant Message" msgstr "Mensagem Publicitária" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "Mensagem" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "Parâmetro em falta" @@ -1548,7 +1632,7 @@ msgstr "Parâmetro em falta" msgid "Missing private keys to sign" msgstr "Faltam chaves privadas para assinar" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "Mais opções" @@ -1558,7 +1642,7 @@ msgstr "Mais opções" msgid "Moved" msgstr "Movido" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "Valores transferidos" @@ -1577,13 +1661,10 @@ msgstr "Nota: Para importar uma carteira de software de terceiros, por favor, v msgid "Name" msgstr "Nome" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "Rede" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" -msgstr "" +msgstr "Taxa de Rede" #: src/js/services/bwcError.js:47 msgid "Network error" @@ -1609,6 +1690,10 @@ msgstr "Próximos passos" msgid "No Wallet" msgstr "Sem carteira" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "Sem backup, sem bitcoin." @@ -1625,7 +1710,7 @@ msgstr "Nenhuma informação de hardware disponível." msgid "No hardware wallets supported on this device" msgstr "Não há carteiras de hardware com suporte neste dispositivo" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "Sem propostas pendentes" @@ -1633,7 +1718,8 @@ msgstr "Sem propostas pendentes" msgid "No recent transactions" msgstr "Não há transações recentes" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "Nenhuma proposta de assinatura: Nenhuma chave privada" @@ -1649,9 +1735,11 @@ msgstr "Carteira não encontrada" msgid "No wallet selected" msgstr "Sem carteira selecionada" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" -msgstr "" +msgstr "Não há carteiras disponíveis" #: www/views/paperWallet.html:47 msgid "No wallets available to receive funds" @@ -1665,7 +1753,7 @@ msgstr "Normal" msgid "Not authorized" msgstr "Não autorizada" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "Não há fundos para taxa" @@ -1699,10 +1787,14 @@ msgstr "Notificações" msgid "Notifications by email" msgstr "Notificações por e-mail" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "Me informe se confirmado" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "Agora é uma boa hora para fazer backup de sua carteira. Se este dispositivo for perdido, é impossível acessar seus fundos sem um backup." @@ -1711,9 +1803,13 @@ 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/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "OK" @@ -1736,7 +1832,7 @@ msgstr "Oh não!" 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:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Abrir" @@ -1753,8 +1849,8 @@ msgstr "Abrir GitHub" msgid "Open GitHub Project" msgstr "Abrir Projeto no GitHub" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Abrir Insight" @@ -1774,6 +1870,10 @@ msgstr "Abrir Site" msgid "Open wallet" msgstr "Abrir Carteira" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "Solicitar o Cartão Bitpay" @@ -1809,6 +1909,7 @@ msgstr "Pague taxas de 0% para transformar bitcoin em dólar." msgid "Pay To" msgstr "Pagar Para" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "Pagamento Aceito" @@ -1846,9 +1947,9 @@ msgstr "Pagamento Recebido" msgid "Payment Rejected" msgstr "Pagamento Rejeitado" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Pagamento Enviado" @@ -1869,7 +1970,7 @@ msgstr "Detalhes do pagamento" msgid "Payment request" msgstr "Pedido de pagamento" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "Proposta pendente" @@ -1930,7 +2031,7 @@ msgstr "A preparar os endereços..." msgid "Preparing backup..." msgstr "A preparar o backup..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "Pressione novamente para sair" @@ -1938,6 +2039,10 @@ msgstr "Pressione novamente para sair" msgid "Priority" msgstr "Prioridade" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "Chave privada criptografada. Digite a senha" @@ -1950,8 +2055,8 @@ msgstr "A Chave privada está criptografada, não é possível acessar" msgid "Proposal Accepted" msgstr "Proposta aceite" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Proposta criada" @@ -1968,6 +2073,10 @@ msgstr "Proposta rejeitada" msgid "Proposals" msgstr "Propostas" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "Notificações" @@ -2006,12 +2115,16 @@ msgstr "Ler mais" msgid "Receive" msgstr "Receber" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "Recebido" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "Valores recebidos" @@ -2056,8 +2169,8 @@ msgstr "Recriado" msgid "Recreating Wallet..." msgstr "Recriando Carteira…" -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "Rejeitado" @@ -2099,7 +2212,7 @@ msgstr "Repetir Senha" msgid "Repeat the password" msgstr "Repita a nova senha" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "Solicitação de impressão digital" @@ -2107,7 +2220,7 @@ msgstr "Solicitação de impressão digital" msgid "Request Specific amount" msgstr "Solicitar quantia exata" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "Solicitar senha de pagamento" @@ -2135,7 +2248,7 @@ msgstr "Tentar Camera novamente" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "Salvar" @@ -2184,7 +2297,7 @@ msgstr "Procurar transações" msgid "Search your currency" msgstr "Procure a sua moeda" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "Segurança" @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "Selecione um arquivo de backup" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "Selecione uma carteira" @@ -2230,7 +2342,7 @@ msgstr "Enviar endereços por e-mail" msgid "Send by email" msgstr "Enviar por E-mail" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "Enviar De" @@ -2238,6 +2350,10 @@ msgstr "Enviar De" msgid "Send max amount" msgstr "Quantidade Máxima de envio" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "Em vez disso, Envie-nos comentários" @@ -2265,7 +2381,7 @@ msgstr "Quantidade máxima de envio" msgid "Sending transaction" msgstr "Enviando transação" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Enviando {{amountStr}} de sua carteira {{name}}" @@ -2276,7 +2392,7 @@ msgstr "Enviando {{amountStr}} de sua carteira {{name}}" msgid "Sent" msgstr "Enviado" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "Enviar Fundos" @@ -2284,6 +2400,10 @@ msgstr "Enviar Fundos" msgid "Server response could not be verified" msgstr "Resposta do servidor não pôde ser verificada" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "Serviços" @@ -2300,6 +2420,10 @@ msgstr "Log da sessão" msgid "Set up a password" msgstr "Configure uma senha" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "Configurações" msgid "Share the love by inviting your friends." msgstr "Compartilhe o amor convidando seus amigos." -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "Compartilhe este convite com seus copayers" @@ -2371,10 +2495,14 @@ msgstr "Único endereço carteira" msgid "Skip" msgstr "Pular" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "Deslize" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2400,10 +2528,6 @@ msgstr "Gastar este balanço necessitará uma taxa de rede Bitcoin significativa msgid "Start sending bitcoin" msgstr "Comece a enviar bitcoin" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "A iniciar..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "Bloqueio de Inicialização" @@ -2420,6 +2544,7 @@ msgstr "Super Econômico" msgid "Sweep" msgstr "Limpar" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Varrer a carteira de papel" @@ -2462,6 +2587,10 @@ msgstr "Termos de uso" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2556,10 +2685,6 @@ msgstr "O histórico de transações e todas as novas transações recebidas sã msgid "The wallet service URL" msgstr "O URL do serviço carteira" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "Não há carteiras para fazer esse pagamento" - #: 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" @@ -2583,7 +2708,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:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "Este bitcoin pagamento pedido expirou." @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). 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:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "Cronograma" @@ -2640,10 +2765,11 @@ msgstr "Para {{reason}} você deve primeiro adicionar sua conta BitPay - {{email msgid "Top up in progress..." msgstr "Recarga em andamento..." -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Recarga de {{amountStr}} para cartão de débito ({{cardLastNumber}})" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "Total de entradas da carteira" msgid "Touch ID Failed" msgstr "Falha no Touch ID" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "Transação" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,19 +2809,16 @@ msgstr "Histórico de Transações" msgid "Transaction already broadcasted" msgstr "Transação foi publicada" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "Transação criada" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" -msgstr "" +msgstr "Transação não foi criada" #: www/views/topup.html:104 msgid "Transaction initiated" msgstr "Transação iniciada" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "Transação não está disponível neste momento" @@ -2700,6 +2827,10 @@ msgstr "Transação não está disponível neste momento" msgid "Transaction not found" msgstr "Transação não encontrada" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "Transferir para" @@ -2748,7 +2879,7 @@ msgstr "Limite de endereços não utilizados" msgid "Update Available" msgstr "Atualização Disponível" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "Atualizando propostas pendentes. Por favor, aguarde" @@ -2793,8 +2924,8 @@ msgstr "Ver todos os endereços" msgid "View Terms of Service" msgstr "Ver os Termos de Serviço" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Exibir Transação no Insight" @@ -2802,7 +2933,7 @@ msgstr "Exibir Transação no Insight" msgid "View Update" msgstr "Ver atualizações" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "Ver no blockchain" @@ -2830,11 +2961,11 @@ msgstr "Esperando por Ledger..." msgid "Waiting for Trezor..." msgstr "Esperando por Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "Aguardando copayers" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "Aguardando…" @@ -2926,7 +3057,7 @@ msgstr "Carteira já em Copay" msgid "Wallet created" msgstr "Carteira criada" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "Carteira incompleta e quebrada" @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "Carteiras & Integrações" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "Estamos sempre procurando maneiras de melhorar o {{appName}}." msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "Estamos sempre procurando maneiras de melhorar o {{appName}}. Como melhorar sua experiência?" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "Estamos sempre procurando por contribuições de tradução! Você pode fazer correções ou ajudar a tornar este app disponível em seu idioma nativo ao aderir à nossa comunidade na Crowdin." @@ -3093,11 +3228,15 @@ msgstr "Você pode trocá-lo por outras moedas como dólares americanos, Euros o msgid "You control your bitcoin." msgstr "Você controla o seu bitcoin." +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "Você precisará entrar de novo para completar seu BitPay Card." -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 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." @@ -3113,6 +3252,10 @@ msgstr "O backup de sua carteira de bitcoins está feito!" msgid "Your bitcoin wallet is ready!" msgstr "Sua carteira de bitcoins está pronta!" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "Suas ideias, comentários ou observações" @@ -3130,6 +3273,14 @@ msgstr "Seu apelido" msgid "Your password" msgstr "Sua senha" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 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." @@ -3167,25 +3318,29 @@ msgstr "nome@exemplo.pt" msgid "preparing..." msgstr "a preparar..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "a aceitar" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "a pagar" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "a enviar" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "{{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:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} será deduzido para taxas de rede bitcoins." @@ -3197,7 +3352,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} da quantidade de envio" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "Transações de {{updatingTxHistoryProgress}} transferidas" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-de-{{wallet.n}}" diff --git a/i18n/po/ru.po b/i18n/po/ru.po index 0e46c3681..975f28789 100644 --- a/i18n/po/ru.po +++ b/i18n/po/ru.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Russian\n" "Language: ru\n" -"PO-Revision-Date: 2017-06-29 07:15-0400\n" +"PO-Revision-Date: 2017-07-18 13:18-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -28,7 +28,7 @@ msgstr "* Предложенный платёж может быть удалён #: www/views/tx-details.html:84 msgid "- {{btx.feeRateStr}} of the transaction" -msgstr "" +msgstr "{{feeRateStr}} транзакции" #: www/views/modals/txp-details.html:104 msgid "- {{tx.feeRateStr}} of the transaction" @@ -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:347 +#: src/js/controllers/confirm.js:351 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "Всего {{amountAboveMaxSizeStr}} было исключено. Превышен максимальный размер, разрешенный для транзакции." -#: src/js/controllers/confirm.js:341 +#: src/js/controllers/confirm.js:345 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "Примечание: в общей сложности {{amountBelowFeeStr}} было исключено. Эти средства входят поступившие в UTXOs меньше чем комиссия сети." @@ -56,8 +56,8 @@ msgstr "Примечание: в общей сложности {{amountBelowFeeS msgid "About" msgstr "О проекте" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "Принято" @@ -117,7 +117,11 @@ msgstr "gfhcdtgfdth" msgid "Add an optional password to secure the recovery phrase" msgstr "Добавьте необязательный пароль для защиты ключевого словосочетания" -#: src/js/controllers/confirm.js:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "Добавить описание" @@ -136,7 +140,6 @@ msgstr "Добавить кошелёк" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "Адрес" @@ -194,10 +197,13 @@ msgstr "Почти готово! Давайте проверим." msgid "Alternative Currency" msgstr "Альтернативная валюта" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "Сумма" @@ -205,7 +211,7 @@ msgstr "Сумма" msgid "Amount below minimum allowed" msgstr "Сумма ниже допустимого минимума" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "Слишком большая сумма" @@ -245,11 +251,11 @@ msgstr "" msgid "Are you sure you want to delete this wallet?" msgstr "Вы точно хотите удалить этот кошелёк?" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "Вы точно хотите отклонить этот платёж?" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "Вы точно хотите удалить эту транзакцию?" @@ -278,7 +284,7 @@ msgstr "Доступно" msgid "Available Balance" msgstr "Доступный баланс" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "Среднее время подтверждения" @@ -290,7 +296,7 @@ msgstr "Среднее время подтверждения" msgid "BIP32 path for address derivation" msgstr "Укажите BIP32 для генерации адресов" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "Резервное копирование" @@ -302,7 +308,7 @@ msgstr "Требуется резервное копирование" msgid "Backup all livenet wallets before using this function" msgstr "Сделайте резервную копию всех livenet кошельков перед использованием этой функции" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "Требуется резервное копирование" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "BitPay Visa® картыllllll" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "Биткойн-адрес" @@ -346,10 +353,6 @@ msgstr "Биткойн-адрес" msgid "Bitcoin Network Fee Policy" msgstr "Политика комиссии сети Биткойн" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "Биткойн URI недействителен!" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "Единица измерения" @@ -370,12 +373,16 @@ msgstr "Биткойн это безопасные,
цифровые день msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "Bitcoin transactions include a fee collected by miners on the network." +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "Отправить платёж" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "Отправка" @@ -387,7 +394,11 @@ msgstr "Отправка транзакции" msgid "Browser unsupported" msgstr "Браузер не поддерживается" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "Купить & продать биткойн" @@ -395,6 +406,10 @@ msgstr "Купить & продать биткойн" msgid "Buy Bitcoin" msgstr "Купить биткойн" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "Покупка биткойн..." @@ -403,18 +418,24 @@ msgstr "Покупка биткойн..." msgid "Calculating fee" msgstr "Вычисление комиссии" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "Отмена" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "" @@ -426,7 +447,7 @@ msgstr "Не удаётся создать кошелёк" msgid "Cannot join the same wallet more that once" msgstr "Нельзя присоединиться к одному и тому же кошельку более одного раза" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "Карты" @@ -458,12 +479,13 @@ msgstr "Очистить" msgid "Clear cache" msgstr "Очистить кэш" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "Click" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,7 +500,7 @@ msgstr "Цвет" msgid "Commit hash" msgstr "Хэш версии" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "Завершите процесс резервного копирования для использования этой опции" @@ -486,9 +508,10 @@ msgstr "Завершите процесс резервного копирова msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "Подтвердить" msgid "Confirm & Finish" msgstr "Подтвердить & Завершить" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "Подтвердите Ваш PIN-код" @@ -576,6 +603,9 @@ msgstr "Скопировано в буфер обмена" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Скопируйте этот текст как есть (в блокнот или письмо)" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "Скопировать в буфер обмена" msgid "Could not access the wallet at the server. Please check:" msgstr "Не удалось получить доступ к кошельку на сервере. Проверьте, пожалуйста:" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "Не удалось получить доступ к кошельку" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "Не удалось добавить сообщение в импортированный кошелёк без общего ключа шифрования" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "Не удалось отправить платёж" @@ -605,11 +639,12 @@ msgstr "Не удалось создать транзакцию" msgid "Could not create address" msgstr "Не удалось создать адрес" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "" @@ -629,23 +664,28 @@ msgstr "Не удалось создать: недействительное к msgid "Could not decrypt file, check your password" msgstr "Не удалось расшифровать файл, проверьте пароль" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "Не удалось удалить предложенный платёж" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "Не удалось получить динамическую комиссию" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "Не удалось получить динамическую комиссию для уровня: {{feeLevel}}" -#: src/js/controllers/topup.js:94 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "Не удалось получить транзакции" @@ -663,7 +703,7 @@ msgstr "Не удалось импортировать. Проверьте им msgid "Could not join wallet" msgstr "Не удалось присоединиться к кошельку" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "Не удалось отклонить платёж" @@ -680,11 +720,12 @@ msgstr "Не удалось удалить карту" msgid "Could not save preferences on the server" msgstr "Не удалось сохранить параметры на сервере" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "Не удалось отправить платёж" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "" @@ -738,15 +779,23 @@ msgstr "Создание кошелька..." msgid "Creating transaction" msgstr "Создание транзакции" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "Текущая комиссия для этой политики" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "Сумма" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "Удалить предложенный платёж" msgid "Delete Wallet" msgstr "Удалить кошелёк" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "Удалите и создайте заново" @@ -788,6 +837,7 @@ msgstr "Путь деривации" msgid "Derivation Strategy" msgstr "Стратегия деривации" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" msgstr "" @@ -832,7 +882,7 @@ msgstr "" msgid "Email" msgstr "Email" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "Email" @@ -844,7 +894,7 @@ msgstr "Достигнут предел пустых адресов. Новые msgid "Enable camera access in your device settings to get started." msgstr "Чтобы начать, разрешите доступ к камере в настройках вашего устройства." -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "Включить email-уведомления" @@ -869,6 +919,10 @@ msgstr "Введите платёжный пароль" msgid "Enter Two Factor for your BitPay account" msgstr "Введите второй фактор вашей учётной записи BitPay" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "Введите новый платёжный пароль" @@ -893,10 +947,12 @@ msgstr "Введите пароль" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "Введите пароль" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,26 +1005,35 @@ msgstr "Введите пароль" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "Ошибка" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "Ошибка при подтверждении" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "Ошибка создания кошелька" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "" @@ -991,7 +1057,7 @@ msgstr "Ошибка обновления Дебетовых Карт" msgid "Exceeded daily limit of $500 per user" msgstr "Превышен дневной лимит в 500$ на пользователя" -#: src/js/controllers/confirm.js:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,8 +1091,8 @@ msgid "Extended Public Keys" msgstr "Расширенные открытые ключи" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." -msgstr "Извлечение информации о кошельке..." +msgid "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1045,6 +1111,14 @@ msgstr "Отпускной бюджет" msgid "Fee" msgstr "Комиссия" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1059,8 +1133,8 @@ msgid "Fetching BitPay Account..." msgstr "Подключение учетной записи BitPay..." #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" -msgstr "Извлечение информации о платеже" +msgid "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 @@ -1082,6 +1156,8 @@ msgstr "Готово" msgid "For audit purposes" msgstr "Для целей ревизии" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1158,14 +1234,26 @@ msgstr "Начните, добавив первый контакт." msgid "Getting fee levels..." msgstr "Получение информации о комиссиях..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "Вернуться" @@ -1198,7 +1286,7 @@ msgstr "Аппаратный кошелёк" msgid "Help & Support" msgstr "Помощь и поддержка" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "Информация о помощи и поддержке доступна на сайте." @@ -1207,7 +1295,7 @@ msgstr "Информация о помощи и поддержке доступ msgid "Hide" msgstr "Спрятать" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "Скрыть баланс" @@ -1282,7 +1370,7 @@ msgstr "Я понимаю, что мои средства безопасно х msgid "I've written it down" msgstr "Я записал" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "Если включено, вся конфиденциальная информация (секретный ключ и фраза для восстановления) и действия (расходы и экспорт) связанные с этим кошельком будут защищены." @@ -1355,12 +1443,14 @@ msgstr "Некорректный формат QR-кода" msgid "Incorrect network address" msgstr "" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "Недостаточно средств" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "Недостаточно средств на комиссию" @@ -1369,7 +1459,8 @@ msgstr "Недостаточно средств на комиссию" msgid "Invalid" msgstr "Недействительно" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "" @@ -1397,6 +1488,7 @@ msgstr "Недействительный путь деривации" msgid "Invitation to share a {{appName}} Wallet" msgstr "Приглашение присоединиться к кошельку {{appName}}" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "" @@ -1504,10 +1596,6 @@ msgstr "" msgid "Low fees" msgstr "Маленькая комиссия" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "Перевести на" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "Вполне разумно" @@ -1525,7 +1613,7 @@ msgstr "Я" msgid "Meh - it's alright" msgstr "Ну так, терпимо" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "Памятка" msgid "Merchant Message" msgstr "Сообщение от продавца" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "Сообщение" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "Недостающий параметр" @@ -1548,7 +1632,7 @@ msgstr "Недостающий параметр" msgid "Missing private keys to sign" msgstr "Отсутствуют закрытые ключи для подписи" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "Дополнительные параметры" @@ -1558,7 +1642,7 @@ msgstr "Дополнительные параметры" msgid "Moved" msgstr "Перемещено" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "Перемещённые средства" @@ -1577,10 +1661,7 @@ msgstr "Примечание: для импортирования кошельк msgid "Name" msgstr "Название" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "Сеть" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" msgstr "" @@ -1609,6 +1690,10 @@ msgstr "Дальнейшие шаги" msgid "No Wallet" msgstr "Нет кошельков" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "Нет резервной копии - нет биткойнов." @@ -1625,7 +1710,7 @@ msgstr "Информация об аппаратном обеспечении о msgid "No hardware wallets supported on this device" msgstr "Аппаратные кошельки не поддерживаются на этом устройстве" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "Нет предложенных платежей" @@ -1633,7 +1718,8 @@ msgstr "Нет предложенных платежей" msgid "No recent transactions" msgstr "Нет недавних транзакций" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "" @@ -1649,7 +1735,9 @@ msgstr "Кошельки не обнаружены" msgid "No wallet selected" msgstr "Не выбран кошелёк" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" msgstr "" @@ -1665,7 +1753,7 @@ msgstr "Обычная" msgid "Not authorized" msgstr "Не авторизован" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "Недостаточно средств для уплаты комиссии" @@ -1699,10 +1787,14 @@ msgstr "Уведомления" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "Если это устройство окажется утеряно, без резервной копии будет невозможно восстановить доступ к деньгам. Самое время создать резервную копию." @@ -1711,9 +1803,13 @@ msgstr "Если это устройство окажется утеряно, б msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "Самое время оценить окружение. Окна поблизости? Скрытые камеры? Плечешпионы?" -#: src/js/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "ХОРОШО" @@ -1736,7 +1832,7 @@ msgstr "О, нет!" msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "На этой вкладке вы можете видеть все ваши кошельки, учетные записи и активы." -#: src/js/controllers/bitpayCard.js:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "Открыть" @@ -1753,8 +1849,8 @@ msgstr "Открытые GitHub" msgid "Open GitHub Project" msgstr "Откройте проект GitHub" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "Открыть Insight" @@ -1774,6 +1870,10 @@ msgstr "Перейти на сайт" msgid "Open wallet" msgstr "Открыть кошелёк" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "Заказать BitPay Card" @@ -1809,6 +1909,7 @@ msgstr "Платите нулевую комиссию за конвертаци msgid "Pay To" msgstr "Отправить платёж" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "Платёж принят" @@ -1846,9 +1947,9 @@ msgstr "Платёж получен" msgid "Payment Rejected" msgstr "Платёж отклонён" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "Платёж отправлен" @@ -1869,7 +1970,7 @@ msgstr "Детали платежа" msgid "Payment request" msgstr "Запрос платежа" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "Рассматриваемые платежи" @@ -1930,7 +2031,7 @@ msgstr "Подготовка адресов..." msgid "Preparing backup..." msgstr "Подготовка резервной копии..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "Нажмите еще раз для выхода" @@ -1938,6 +2039,10 @@ msgstr "Нажмите еще раз для выхода" msgid "Priority" msgstr "Приоритетная" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "Приватный ключ зашифрован. Введите пароль" @@ -1950,8 +2055,8 @@ msgstr "Закрытый ключ зашифрован, не удалось по msgid "Proposal Accepted" msgstr "Платёж принят" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "Платёж создан" @@ -1968,6 +2073,10 @@ msgstr "Платёж отклонён" msgid "Proposals" msgstr "Предложенные платежи" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "Push-уведомления" @@ -2006,12 +2115,16 @@ msgstr "Показать больше" msgid "Receive" msgstr "Получить" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "Получено" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "Полученные средства" @@ -2056,8 +2169,8 @@ msgstr "Создать заново" msgid "Recreating Wallet..." msgstr "Воссоздаю кошелёк..." -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "Отклонён" @@ -2099,7 +2212,7 @@ msgstr "Повторите пароль" msgid "Repeat the password" msgstr "Повторите пароль" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "Запрос отпечатка пальца" @@ -2107,7 +2220,7 @@ msgstr "Запрос отпечатка пальца" msgid "Request Specific amount" msgstr "Запросить определенную сумму" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "Запрашивать платёжный пароль" @@ -2135,7 +2248,7 @@ msgstr "Проверить камеру" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "Сохранить" @@ -2184,7 +2297,7 @@ msgstr "Поиск транзакций" msgid "Search your currency" msgstr "Найти вашу валюту" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "Безопасность" @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "Выберите файл резервной копии" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "Выберите кошелёк" @@ -2230,7 +2342,7 @@ msgstr "Отправить адреса по email" msgid "Send by email" msgstr "Отправить на email" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "Отправить от" @@ -2238,6 +2350,10 @@ msgstr "Отправить от" msgid "Send max amount" msgstr "Отправить макс. сумму" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "Или отправьте нам отзыв" @@ -2265,7 +2381,7 @@ msgstr "Отправляю максимальную сумму" msgid "Sending transaction" msgstr "Отправка транзакции" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "Отправка {{amountStr}} из вашего кошелька {{name}}" @@ -2276,7 +2392,7 @@ msgstr "Отправка {{amountStr}} из вашего кошелька {{name msgid "Sent" msgstr "Отправлено" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "Отправленные средства" @@ -2284,6 +2400,10 @@ msgstr "Отправленные средства" msgid "Server response could not be verified" msgstr "Ответ сервера не может быть проверен" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "Службы" @@ -2300,6 +2420,10 @@ msgstr "Журнал сеанса" msgid "Set up a password" msgstr "Задайте пароль" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "Параметры" msgid "Share the love by inviting your friends." msgstr "Поделитесь любовью и пригласите друзей." -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "Отправьте приглашение совладельцам кошелька" @@ -2371,10 +2495,14 @@ msgstr "Кошелёк с одним адресом" msgid "Skip" msgstr "Пропустить" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "Сдвинуть" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2400,10 +2528,6 @@ msgstr "" msgid "Start sending bitcoin" msgstr "Начать отправку bitcoin" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "Запуск..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "Блокировка при запуске" @@ -2420,6 +2544,7 @@ msgstr "Очень экономичная" msgid "Sweep" msgstr "Считать" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Пополнить с бумажного кошелька" @@ -2462,6 +2587,10 @@ msgstr "Условия использования" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2556,10 +2685,6 @@ msgstr "" msgid "The wallet service URL" msgstr "Адрес сервера Bitcore" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "Нет кошельков, чтобы осуществить этот платёж" - #: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "Доступна новая версия {{appName}}" @@ -2583,7 +2708,7 @@ msgstr "Замечательное приложение!" msgid "This app stores your bitcoin with cutting-edge security." msgstr "" -#: src/js/controllers/confirm.js:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "Этот запрос платежа истёк." @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). msgstr "Это кошелёк не зарегистрирован на данном сервере Bitcore. Вы можете воссоздать его из локальной информации." #: www/views/modals/txp-details.html:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "Хронология" @@ -2640,10 +2765,11 @@ msgstr "" msgid "Top up in progress..." msgstr "" -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "" msgid "Touch ID Failed" msgstr "Ошибка Touch ID" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "Транзакция" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,11 +2809,8 @@ msgstr "История транзакций" msgid "Transaction already broadcasted" msgstr "Транзакция уже отправлена" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "Транзакция создана" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "" @@ -2691,7 +2818,7 @@ msgstr "" msgid "Transaction initiated" msgstr "" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "Транзакция недоступна в данный момент" @@ -2700,6 +2827,10 @@ msgstr "Транзакция недоступна в данный момент" msgid "Transaction not found" msgstr "Транзакция не обнаружена" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "" @@ -2748,7 +2879,7 @@ msgstr "Лимит неиспользованных адресов" msgid "Update Available" msgstr "Доступно обновление" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "Обновление ожидающих рассмотрения платежей. Подождите, пожалуйста" @@ -2793,8 +2924,8 @@ msgstr "Просмотреть все адреса" msgid "View Terms of Service" msgstr "Посмотреть Условия обслуживания" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "Просмотреть транзакцию на Insight" @@ -2802,7 +2933,7 @@ msgstr "Просмотреть транзакцию на Insight" msgid "View Update" msgstr "Просмотреть обновление" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "Посмотреть в блокчейне" @@ -2830,11 +2961,11 @@ msgstr "Ожидание Ledger..." msgid "Waiting for Trezor..." msgstr "Ожидание Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "Ожидание совладельцев кошелька" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "Ожидание..." @@ -2926,7 +3057,7 @@ msgstr "Кошелёк уже в Copay" msgid "Wallet created" msgstr "Кошелёк создан" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "Не все совладельцы присоединились, кошелёк повреждён" @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "Кошельки и интеграция" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "Мы всегда ищем пути улучшения {{appName}}." msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "" @@ -3093,11 +3228,15 @@ msgstr "" msgid "You control your bitcoin." msgstr "Вы контролируете Ваши bitcoin-ы." +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "" -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "Вы будете получать email-уведомления о входящих и исходящих платежах." @@ -3113,6 +3252,10 @@ msgstr "Резервная копия кошелька создана!" msgid "Your bitcoin wallet is ready!" msgstr "Ваш кошелёк готов!" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "Ваши идеи, отзывы или комментарии" @@ -3130,6 +3273,14 @@ msgstr "Ваше псевдоним" msgid "Your password" msgstr "Ваш пароль" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "Ваш кошелёк никогда не сохраняется в облачное хранилище или в резервные копии устройства." @@ -3167,25 +3318,29 @@ msgstr "name@example.com" msgid "preparing..." msgstr "Подготавливается..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "принять" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "оплатить" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "отправить" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "{{appName}} требует Bitcore для координации совладельцев и получения информации из блокчейна. По-умолчанию используется сервер https://bws.bitpay.com (публичный сервер Bitcore компании BitPay)." -#: src/js/controllers/confirm.js:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} будет использовано для оплаты комиссии." @@ -3197,7 +3352,7 @@ msgstr "" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "{{updatingTxHistoryProgress}} транзакций загружено" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}-из-{{wallet.n}}" diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 7d5b41420..c9e1a1f1e 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -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:347 +#: src/js/controllers/confirm.js:351 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "" -#: src/js/controllers/confirm.js:341 +#: src/js/controllers/confirm.js:345 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "" @@ -47,8 +47,8 @@ msgstr "" msgid "About" msgstr "" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "" @@ -108,7 +108,11 @@ msgstr "" msgid "Add an optional password to secure the recovery phrase" msgstr "" -#: src/js/controllers/confirm.js:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "" @@ -127,7 +131,6 @@ msgstr "" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "" @@ -185,10 +188,13 @@ msgstr "" msgid "Alternative Currency" msgstr "" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "" @@ -196,7 +202,7 @@ msgstr "" msgid "Amount below minimum allowed" msgstr "" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "" @@ -236,11 +242,11 @@ msgstr "" msgid "Are you sure you want to delete this wallet?" msgstr "" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "" @@ -269,7 +275,7 @@ msgstr "" msgid "Available Balance" msgstr "" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "" @@ -281,7 +287,7 @@ msgstr "" msgid "BIP32 path for address derivation" msgstr "" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "" @@ -293,7 +299,7 @@ msgstr "" msgid "Backup all livenet wallets before using this function" msgstr "" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "" @@ -328,6 +334,7 @@ msgid "BitPay Visa® Cards" msgstr "" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "" @@ -337,10 +344,6 @@ msgstr "" msgid "Bitcoin Network Fee Policy" msgstr "" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "" @@ -361,12 +364,16 @@ msgstr "" msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "" +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "" @@ -378,7 +385,11 @@ msgstr "" msgid "Browser unsupported" msgstr "" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "" @@ -386,6 +397,10 @@ msgstr "" msgid "Buy Bitcoin" msgstr "" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "" @@ -394,18 +409,24 @@ msgstr "" msgid "Calculating fee" msgstr "" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "" @@ -417,7 +438,7 @@ msgstr "" msgid "Cannot join the same wallet more that once" msgstr "" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "" @@ -449,12 +470,13 @@ msgstr "" msgid "Clear cache" msgstr "" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -469,7 +491,7 @@ msgstr "" msgid "Commit hash" msgstr "" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "" @@ -477,9 +499,10 @@ msgstr "" msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -492,6 +515,10 @@ msgstr "" msgid "Confirm & Finish" msgstr "" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "" @@ -567,6 +594,9 @@ msgstr "" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -576,15 +606,19 @@ msgstr "" msgid "Could not access the wallet at the server. Please check:" msgstr "" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "" @@ -596,11 +630,12 @@ msgstr "" msgid "Could not create address" msgstr "" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "" @@ -620,23 +655,28 @@ msgstr "" msgid "Could not decrypt file, check your password" msgstr "" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "" -#: src/js/controllers/topup.js:94 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "" @@ -654,7 +694,7 @@ msgstr "" msgid "Could not join wallet" msgstr "" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "" @@ -671,11 +711,12 @@ msgstr "" msgid "Could not save preferences on the server" msgstr "" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "" @@ -729,15 +770,23 @@ msgstr "" msgid "Creating transaction" msgstr "" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -756,7 +805,7 @@ msgstr "" msgid "Delete Wallet" msgstr "" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "" @@ -779,6 +828,7 @@ msgstr "" msgid "Derivation Strategy" msgstr "" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" msgstr "" @@ -823,7 +873,7 @@ msgstr "" msgid "Email" msgstr "" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "" @@ -835,7 +885,7 @@ msgstr "" msgid "Enable camera access in your device settings to get started." msgstr "" -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "" @@ -860,6 +910,10 @@ msgstr "" msgid "Enter Two Factor for your BitPay account" msgstr "" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "" @@ -884,10 +938,12 @@ msgstr "" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -928,7 +984,8 @@ msgstr "" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -939,26 +996,35 @@ msgstr "" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "" @@ -982,7 +1048,7 @@ msgstr "" msgid "Exceeded daily limit of $500 per user" msgstr "" -#: src/js/controllers/confirm.js:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1016,7 +1082,7 @@ msgid "Extended Public Keys" msgstr "" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." +msgid "Extracting Wallet information..." msgstr "" #: src/js/controllers/export.js:115 @@ -1036,6 +1102,14 @@ msgstr "" msgid "Fee" msgstr "" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1050,7 +1124,7 @@ msgid "Fetching BitPay Account..." msgstr "" #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" +msgid "Fetching payment information" msgstr "" #: www/views/export.html:14 @@ -1073,6 +1147,8 @@ msgstr "" msgid "For audit purposes" msgstr "" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1149,14 +1225,26 @@ msgstr "" msgid "Getting fee levels..." msgstr "" -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "" @@ -1189,7 +1277,7 @@ msgstr "" msgid "Help & Support" msgstr "" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "" @@ -1198,7 +1286,7 @@ msgstr "" msgid "Hide" msgstr "" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "" @@ -1273,7 +1361,7 @@ msgstr "" msgid "I've written it down" msgstr "" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "" @@ -1346,12 +1434,14 @@ msgstr "" msgid "Incorrect network address" msgstr "" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "" @@ -1360,7 +1450,8 @@ msgstr "" msgid "Invalid" msgstr "" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "" @@ -1388,6 +1479,7 @@ msgstr "" msgid "Invitation to share a {{appName}} Wallet" msgstr "" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "" @@ -1495,10 +1587,6 @@ msgstr "" msgid "Low fees" msgstr "" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "" @@ -1516,7 +1604,7 @@ msgstr "" msgid "Meh - it's alright" msgstr "" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1527,10 +1615,6 @@ msgstr "" msgid "Merchant Message" msgstr "" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "" @@ -1539,7 +1623,7 @@ msgstr "" msgid "Missing private keys to sign" msgstr "" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "" @@ -1549,7 +1633,7 @@ msgstr "" msgid "Moved" msgstr "" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "" @@ -1568,10 +1652,7 @@ msgstr "" msgid "Name" msgstr "" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" msgstr "" @@ -1600,6 +1681,10 @@ msgstr "" msgid "No Wallet" msgstr "" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "" @@ -1616,7 +1701,7 @@ msgstr "" msgid "No hardware wallets supported on this device" msgstr "" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "" @@ -1624,7 +1709,8 @@ msgstr "" msgid "No recent transactions" msgstr "" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "" @@ -1640,7 +1726,9 @@ msgstr "" msgid "No wallet selected" msgstr "" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" msgstr "" @@ -1656,7 +1744,7 @@ msgstr "" msgid "Not authorized" msgstr "" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "" @@ -1690,10 +1778,14 @@ msgstr "" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "" @@ -1702,9 +1794,13 @@ msgstr "" msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "" -#: src/js/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "" @@ -1727,7 +1823,7 @@ msgstr "" msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "" -#: src/js/controllers/bitpayCard.js:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "" @@ -1744,8 +1840,8 @@ msgstr "" msgid "Open GitHub Project" msgstr "" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "" @@ -1765,6 +1861,10 @@ msgstr "" msgid "Open wallet" msgstr "" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "" @@ -1800,6 +1900,7 @@ msgstr "" msgid "Pay To" msgstr "" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "" @@ -1837,9 +1938,9 @@ msgstr "" msgid "Payment Rejected" msgstr "" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "" @@ -1860,7 +1961,7 @@ msgstr "" msgid "Payment request" msgstr "" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "" @@ -1921,7 +2022,7 @@ msgstr "" msgid "Preparing backup..." msgstr "" -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "" @@ -1929,6 +2030,10 @@ msgstr "" msgid "Priority" msgstr "" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "" @@ -1941,8 +2046,8 @@ msgstr "" msgid "Proposal Accepted" msgstr "" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "" @@ -1959,6 +2064,10 @@ msgstr "" msgid "Proposals" msgstr "" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "" @@ -1997,12 +2106,16 @@ msgstr "" msgid "Receive" msgstr "" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "" @@ -2047,8 +2160,8 @@ msgstr "" msgid "Recreating Wallet..." msgstr "" -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "" @@ -2090,7 +2203,7 @@ msgstr "" msgid "Repeat the password" msgstr "" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "" @@ -2098,7 +2211,7 @@ msgstr "" msgid "Request Specific amount" msgstr "" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "" @@ -2126,7 +2239,7 @@ msgstr "" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "" @@ -2175,7 +2288,7 @@ msgstr "" msgid "Search your currency" msgstr "" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "" @@ -2184,7 +2297,6 @@ msgid "Select a backup file" msgstr "" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "" @@ -2221,7 +2333,7 @@ msgstr "" msgid "Send by email" msgstr "" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "" @@ -2229,6 +2341,10 @@ msgstr "" msgid "Send max amount" msgstr "" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "" @@ -2256,7 +2372,7 @@ msgstr "" msgid "Sending transaction" msgstr "" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "" @@ -2267,7 +2383,7 @@ msgstr "" msgid "Sent" msgstr "" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "" @@ -2275,6 +2391,10 @@ msgstr "" msgid "Server response could not be verified" msgstr "" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "" @@ -2291,6 +2411,10 @@ msgstr "" msgid "Set up a password" msgstr "" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2301,7 +2425,7 @@ msgstr "" msgid "Share the love by inviting your friends." msgstr "" -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "" @@ -2362,10 +2486,14 @@ msgstr "" msgid "Skip" msgstr "" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2391,10 +2519,6 @@ msgstr "" msgid "Start sending bitcoin" msgstr "" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "" - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "" @@ -2411,6 +2535,7 @@ msgstr "" msgid "Sweep" msgstr "" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "" @@ -2453,6 +2578,10 @@ msgstr "" msgid "Testnet" msgstr "" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2547,10 +2676,6 @@ msgstr "" msgid "The wallet service URL" msgstr "" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "" - #: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "" @@ -2574,7 +2699,7 @@ msgstr "" msgid "This app stores your bitcoin with cutting-edge security." msgstr "" -#: src/js/controllers/confirm.js:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "" @@ -2602,7 +2727,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). msgstr "" #: www/views/modals/txp-details.html:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "" @@ -2631,10 +2756,11 @@ msgstr "" msgid "Top up in progress..." msgstr "" -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2657,10 +2783,14 @@ msgstr "" msgid "Touch ID Failed" msgstr "" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2670,11 +2800,8 @@ msgstr "" msgid "Transaction already broadcasted" msgstr "" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "" @@ -2682,7 +2809,7 @@ msgstr "" msgid "Transaction initiated" msgstr "" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "" @@ -2691,6 +2818,10 @@ msgstr "" msgid "Transaction not found" msgstr "" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "" @@ -2739,7 +2870,7 @@ msgstr "" msgid "Update Available" msgstr "" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "" @@ -2784,8 +2915,8 @@ msgstr "" msgid "View Terms of Service" msgstr "" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "" @@ -2793,7 +2924,7 @@ msgstr "" msgid "View Update" msgstr "" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "" @@ -2821,11 +2952,11 @@ msgstr "" msgid "Waiting for Trezor..." msgstr "" -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "" @@ -2917,7 +3048,7 @@ msgstr "" msgid "Wallet created" msgstr "" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "" @@ -2976,8 +3107,8 @@ msgid "Wallets & Integrations" msgstr "" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3008,6 +3139,10 @@ msgstr "" msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "" @@ -3084,11 +3219,15 @@ msgstr "" msgid "You control your bitcoin." msgstr "" +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "" -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "" @@ -3104,6 +3243,10 @@ msgstr "" msgid "Your bitcoin wallet is ready!" msgstr "" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "" @@ -3121,6 +3264,14 @@ msgstr "" msgid "Your password" msgstr "" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "" @@ -3158,25 +3309,29 @@ msgstr "" msgid "preparing..." msgstr "" -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "" -#: src/js/controllers/confirm.js:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "" @@ -3188,7 +3343,7 @@ msgstr "" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "" diff --git a/i18n/po/zh.po b/i18n/po/zh.po index c43130fb9..96202a3c2 100644 --- a/i18n/po/zh.po +++ b/i18n/po/zh.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Chinese Simplified\n" "Language: zh\n" -"PO-Revision-Date: 2017-06-29 07:15-0400\n" +"PO-Revision-Date: 2017-07-18 13:18-0400\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -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:347 +#: src/js/controllers/confirm.js:351 msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded." msgstr "备注︰共有{{amountAboveMaxSizeStr}} 被排除了。超出了交易允许的最大体积" -#: src/js/controllers/confirm.js:341 +#: src/js/controllers/confirm.js:345 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." msgstr "备注：共有{{amountBelowFeeStr}} 被排除了。这些来自 UTXOs 的资金小于提供的网络费用。" @@ -56,8 +56,8 @@ msgstr "备注：共有{{amountBelowFeeStr}} 被排除了。这些来自 UTXOs msgid "About" msgstr "关于" -#: src/js/controllers/modals/txpDetails.js:52 -#: src/js/controllers/tx-details.js:60 +#: src/js/controllers/modals/txpDetails.js:56 +#: src/js/controllers/tx-details.js:62 msgid "Accepted" msgstr "同意" @@ -117,7 +117,11 @@ msgstr "添加帐户" msgid "Add an optional password to secure the recovery phrase" msgstr "添加可选的密码，以保护恢复短语" -#: src/js/controllers/confirm.js:370 +#: www/views/includes/incomingDataMenu.html:41 +msgid "Add as a contact" +msgstr "" + +#: src/js/controllers/confirm.js:374 msgid "Add description" msgstr "添加描述" @@ -136,7 +140,6 @@ msgstr "添加钱包" #: www/views/addressbook.view.html:26 #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 -#: www/views/paymentUri.html:15 msgid "Address" msgstr "地址" @@ -194,10 +197,13 @@ msgstr "差不多完成了 ！让我们回顾一下。" msgid "Alternative Currency" msgstr "替代货币" +#: src/js/controllers/buyAmazon.js:97 +msgid "Amazon.com is not available at this moment. Please try back later." +msgstr "" + #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 -#: www/views/paymentUri.html:16 msgid "Amount" msgstr "数额" @@ -205,7 +211,7 @@ msgstr "数额" msgid "Amount below minimum allowed" msgstr "数额低于最低允许值" -#: src/js/controllers/confirm.js:188 +#: src/js/controllers/confirm.js:191 msgid "Amount too big" msgstr "量太大" @@ -245,11 +251,11 @@ msgstr "" msgid "Are you sure you want to delete this wallet?" msgstr "确定要删除这钱包？" -#: src/js/controllers/modals/txpDetails.js:144 +#: src/js/controllers/modals/txpDetails.js:148 msgid "Are you sure you want to reject this transaction?" msgstr "确定拒绝这笔交易？" -#: src/js/controllers/modals/txpDetails.js:161 +#: src/js/controllers/modals/txpDetails.js:165 msgid "Are you sure you want to remove this transaction?" msgstr "确定要删除这项交易吗？" @@ -278,7 +284,7 @@ msgstr "可用空间" msgid "Available Balance" msgstr "可用余额" -#: www/views/modals/chooseFeeLevel.html:14 +#: www/views/modals/chooseFeeLevel.html:24 #: www/views/preferencesFee.html:15 msgid "Average confirmation time" msgstr "平均确认时间" @@ -290,7 +296,7 @@ msgstr "平均确认时间" msgid "BIP32 path for address derivation" msgstr "BIP32 路径的地址衍生" -#: www/views/preferences.html:39 +#: www/views/preferences.html:34 msgid "Backup" msgstr "备份" @@ -302,7 +308,7 @@ msgstr "需要备份" msgid "Backup all livenet wallets before using this function" msgstr "" -#: www/views/preferences.html:41 +#: www/views/preferences.html:36 #: www/views/tab-settings.html:120 msgid "Backup needed" msgstr "需要备份" @@ -337,6 +343,7 @@ msgid "BitPay Visa® Cards" msgstr "BitPay Visa® 牌" #: www/views/addressbook.add.html:38 +#: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" msgstr "比特币地址" @@ -346,10 +353,6 @@ msgstr "比特币地址" msgid "Bitcoin Network Fee Policy" msgstr "比特币网络手续费策略" -#: www/views/paymentUri.html:10 -msgid "Bitcoin URI is NOT valid!" -msgstr "比特币 URI 无效！" - #: www/views/tab-settings.html:63 msgid "Bitcoin Unit" msgstr "比特币单位" @@ -370,12 +373,16 @@ msgstr "比特币是安全的
数字货币。" msgid "Bitcoin transactions include a fee collected by miners on the network." msgstr "比特币交易包括在网络上被矿工所收取的费用。" +#: www/views/buyAmazon.html:108 +msgid "Bought {{amountUnitStr}}" +msgstr "" + #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" msgstr "广播支付" -#: src/js/controllers/modals/txpDetails.js:54 -#: src/js/controllers/tx-details.js:62 +#: src/js/controllers/modals/txpDetails.js:58 +#: src/js/controllers/tx-details.js:64 msgid "Broadcasted" msgstr "广播商" @@ -387,7 +394,11 @@ msgstr "正在广播交易" msgid "Browser unsupported" msgstr "不受支持的浏览器" -#: www/views/includes/buyAndSellCard.html:4 +#: www/views/buyAmazon.html:5 +msgid "Buy" +msgstr "" + +#: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" msgstr "购买或出售比特币" @@ -395,6 +406,10 @@ msgstr "购买或出售比特币" msgid "Buy Bitcoin" msgstr "购买比特币" +#: src/js/controllers/buyAmazon.js:332 +msgid "Buy from" +msgstr "" + #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." msgstr "正在发送 比特币..." @@ -403,18 +418,24 @@ msgstr "正在发送 比特币..." msgid "Calculating fee" msgstr "正在计算费用" -#: src/js/controllers/confirm.js:491 -#: src/js/controllers/topup.js:277 -#: src/js/services/popupService.js:60 +#: src/js/controllers/buyAmazon.js:311 +#: src/js/controllers/confirm.js:495 +#: src/js/controllers/topup.js:285 +#: src/js/services/popupService.js:62 +#: src/js/services/popupService.js:73 #: www/views/addressbook.add.html:10 #: www/views/feedback/send.html:5 +#: www/views/includes/incomingDataMenu.html:22 +#: www/views/includes/incomingDataMenu.html:54 +#: www/views/includes/incomingDataMenu.html:73 +#: www/views/includes/incomingDataMenu.html:97 #: www/views/includes/note.html:6 #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" msgstr "取消" -#: www/views/copayers.html:37 +#: www/views/copayers.html:36 msgid "Cancel invitation" msgstr "" @@ -426,7 +447,7 @@ msgstr "不能创建钱包" msgid "Cannot join the same wallet more that once" msgstr "无法重复加入同一个钱包" -#: www/views/includes/bitpayCardsCard.html:4 +#: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" msgstr "卡" @@ -458,12 +479,13 @@ msgstr "清除" msgid "Clear cache" msgstr "清空缓存" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Click" msgstr "点击" #: www/views/customAmount.html:4 #: www/views/modals/paypro.html:4 +#: www/views/modals/pin.html:3 #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 @@ -478,7 +500,7 @@ msgstr "颜色" msgid "Commit hash" msgstr "提交哈希" -#: www/views/preferences.html:53 +#: www/views/preferences.html:48 msgid "Complete the backup process to use this option" msgstr "" @@ -486,9 +508,10 @@ msgstr "" msgid "Completed" msgstr "" -#: src/js/controllers/confirm.js:490 +#: src/js/controllers/buyAmazon.js:309 +#: src/js/controllers/confirm.js:494 #: src/js/controllers/copayers.js:55 -#: src/js/controllers/topup.js:275 +#: src/js/controllers/topup.js:283 #: www/views/backup.html:53 #: www/views/backup.html:72 #: www/views/confirm.html:4 @@ -501,6 +524,10 @@ msgstr "确定" msgid "Confirm & Finish" msgstr "确认并完成" +#: www/views/buyAmazon.html:90 +msgid "Confirm purchase" +msgstr "" + #: www/views/modals/pin.html:10 msgid "Confirm your PIN" msgstr "" @@ -576,6 +603,9 @@ msgstr "已复制到剪贴板" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "将此文本复制到一个安全的地方（记事本或电子邮件）" +#: www/views/includes/incomingDataMenu.html:51 +#: www/views/includes/incomingDataMenu.html:70 +#: www/views/includes/incomingDataMenu.html:94 #: www/views/preferencesLogs.html:10 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" @@ -585,15 +615,19 @@ msgstr "复制到剪贴板" msgid "Could not access the wallet at the server. Please check:" msgstr "无法访问服务器上的钱包。请确认︰" +#: src/js/controllers/buyAmazon.js:101 +msgid "Could not access to Amazon.com" +msgstr "" + #: src/js/services/profileService.js:493 msgid "Could not access wallet" msgstr "无法访问钱包" -#: src/js/controllers/confirm.js:182 +#: src/js/controllers/confirm.js:185 msgid "Could not add message to imported wallet without shared encrypting key" msgstr "无法将消息添加到进口钱包没有共享的加密密钥" -#: src/js/controllers/modals/txpDetails.js:189 +#: src/js/controllers/modals/txpDetails.js:193 msgid "Could not broadcast payment" msgstr "无法广播支付" @@ -605,11 +639,12 @@ msgstr "无法建立交易" msgid "Could not create address" msgstr "无法创建地址" -#: src/js/controllers/topup.js:86 +#: src/js/controllers/topup.js:91 msgid "Could not create the invoice" msgstr "" -#: src/js/controllers/topup.js:136 +#: src/js/controllers/buyAmazon.js:163 +#: src/js/controllers/topup.js:141 msgid "Could not create transaction" msgstr "" @@ -629,23 +664,28 @@ msgstr "无法创建 ︰ 无效的钱包恢复短语" msgid "Could not decrypt file, check your password" msgstr "无法解密文件，请检查你的密码" -#: src/js/controllers/modals/txpDetails.js:171 +#: src/js/controllers/modals/txpDetails.js:175 msgid "Could not delete payment proposal" msgstr "无法删除支付提议" -#: src/js/services/feeService.js:68 +#: src/js/services/feeService.js:72 msgid "Could not get dynamic fee" msgstr "不能动态费用" -#: src/js/services/feeService.js:38 +#: src/js/services/feeService.js:42 msgid "Could not get dynamic fee for level: {{feeLevel}}" msgstr "无法获取水平动态费用︰ {{feeLevel}}" -#: src/js/controllers/topup.js:94 +#: src/js/controllers/modals/feeLevels.js:113 +msgid "Could not get fee levels" +msgstr "" + +#: src/js/controllers/buyAmazon.js:121 +#: src/js/controllers/topup.js:99 msgid "Could not get the invoice" msgstr "" -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" msgstr "不能交易" @@ -663,7 +703,7 @@ msgstr "无法导入。请检查输入文件和支付密码" msgid "Could not join wallet" msgstr "无法加入钱包" -#: src/js/controllers/modals/txpDetails.js:151 +#: src/js/controllers/modals/txpDetails.js:155 msgid "Could not reject payment" msgstr "无法拒绝支付" @@ -680,11 +720,12 @@ msgstr "无法删除卡" msgid "Could not save preferences on the server" msgstr "无法在服务器上保存首选项" -#: src/js/controllers/modals/txpDetails.js:137 +#: src/js/controllers/modals/txpDetails.js:141 msgid "Could not send payment" msgstr "无法发送支付" -#: src/js/controllers/topup.js:289 +#: src/js/controllers/buyAmazon.js:323 +#: src/js/controllers/topup.js:297 msgid "Could not send transaction" msgstr "" @@ -738,15 +779,23 @@ msgstr "正在创建钱包..." msgid "Creating transaction" msgstr "正在创建交易" -#: www/views/modals/chooseFeeLevel.html:19 +#: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" msgstr "此策略的当前费用率" +#: src/js/services/feeService.js:15 +msgid "Custom" +msgstr "" + #: www/views/customAmount.html:9 msgid "Custom Amount" msgstr "自定义金额" +#: src/js/controllers/preferencesFee.js:84 +msgid "Custom Fee" +msgstr "" + #: www/views/modals/txp-details.html:89 #: www/views/tx-details.html:68 msgid "Date" @@ -765,7 +814,7 @@ msgstr "删除支付提议" msgid "Delete Wallet" msgstr "删除钱包" -#: www/views/copayers.html:60 +#: www/views/copayers.html:59 msgid "Delete it and create a new one" msgstr "删除并创建新的" @@ -788,6 +837,7 @@ msgstr "衍生路径" msgid "Derivation Strategy" msgstr "衍生策略" +#: www/views/buyAmazon.html:39 #: www/views/topup.html:45 msgid "Details" msgstr "" @@ -832,7 +882,7 @@ msgstr "" msgid "Email" msgstr "电子邮件" -#: www/views/preferencesNotifications.html:36 +#: www/views/preferencesNotifications.html:42 msgid "Email Address" msgstr "电子邮件地址" @@ -844,7 +894,7 @@ msgstr "已达到空地址限制。无法生成新的地址。" msgid "Enable camera access in your device settings to get started." msgstr "相机中启用访问您的设备设置入门。" -#: www/views/preferencesNotifications.html:23 +#: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" msgstr "启用电子邮件通知" @@ -869,6 +919,10 @@ msgstr "输入支出密码" msgid "Enter Two Factor for your BitPay account" msgstr "为您的 BitPay 帐户输入两个因素" +#: www/views/modals/chooseFeeLevel.html:41 +msgid "Enter custom fee" +msgstr "" + #: src/js/services/walletService.js:1030 msgid "Enter new spending password" msgstr "输入新的消费密码" @@ -893,10 +947,12 @@ msgstr "请输入你的密码" #: src/js/controllers/addressbookView.js:29 #: src/js/controllers/addresses.js:130 #: src/js/controllers/addresses.js:131 -#: src/js/controllers/bitpayCard.js:69 +#: src/js/controllers/bitpayCard.js:66 #: src/js/controllers/bitpayCardIntro.js:40 #: src/js/controllers/bitpayCardIntro.js:81 -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/buyAmazon.js:23 +#: src/js/controllers/buyAmazon.js:34 +#: src/js/controllers/confirm.js:276 #: src/js/controllers/copayers.js:67 #: src/js/controllers/create.js:155 #: src/js/controllers/create.js:168 @@ -937,7 +993,8 @@ msgstr "请输入你的密码" #: 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/modals/feeLevels.js:10 +#: src/js/controllers/modals/txpDetails.js:134 #: src/js/controllers/paperWallet.js:47 #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:33 @@ -948,26 +1005,35 @@ msgstr "请输入你的密码" #: src/js/controllers/tab-send.js:132 #: src/js/controllers/tabsController.js:36 #: src/js/controllers/tabsController.js:7 -#: src/js/controllers/topup.js:15 -#: src/js/controllers/topup.js:26 -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/topup.js:20 +#: src/js/controllers/topup.js:31 +#: src/js/controllers/tx-details.js:102 #: src/js/services/incomingData.js:98 msgid "Error" msgstr "错误！" -#: src/js/controllers/confirm.js:443 +#: src/js/controllers/confirm.js:447 msgid "Error at confirm" msgstr "在确认错误" +#: src/js/controllers/buyAmazon.js:178 +msgid "Error creating gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:93 +msgid "Error creating the invoice" +msgstr "" + #: src/js/services/profileService.js:396 msgid "Error creating wallet" msgstr "创建钱包时出现错误" -#: src/js/controllers/confirm.js:261 +#: src/js/controllers/confirm.js:266 msgid "Error getting SendMax information" msgstr "" -#: src/js/controllers/topup.js:108 +#: src/js/controllers/buyAmazon.js:135 +#: src/js/controllers/topup.js:113 msgid "Error in Payment Protocol" msgstr "" @@ -991,7 +1057,7 @@ msgstr "更新借记卡时出错" msgid "Exceeded daily limit of $500 per user" msgstr "超过 500 美元，每个用户的每日限额" -#: src/js/controllers/confirm.js:407 +#: src/js/controllers/confirm.js:411 #: www/views/confirm.html:27 #: www/views/modals/txp-details.html:121 msgid "Expired" @@ -1025,8 +1091,8 @@ msgid "Extended Public Keys" msgstr "扩展的公钥" #: src/js/services/onGoingProcess.js:20 -msgid "Extracting Wallet Information..." -msgstr "正在获取钱包信息..." +msgid "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1045,6 +1111,14 @@ msgstr "家庭度假资金" msgid "Fee" msgstr "费用" +#: www/views/modals/chooseFeeLevel.html:73 +msgid "Fee level" +msgstr "" + +#: src/js/controllers/modals/feeLevels.js:101 +msgid "Fee level is not defined" +msgstr "" + #: www/views/confirm.html:81 #: www/views/modals/txp-details.html:101 msgid "Fee:" @@ -1059,8 +1133,8 @@ msgid "Fetching BitPay Account..." msgstr "" #: src/js/services/onGoingProcess.js:21 -msgid "Fetching Payment Information" -msgstr "获取支付信息" +msgid "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 @@ -1082,6 +1156,8 @@ msgstr "完成" msgid "For audit purposes" msgstr "供审计目的" +#: src/js/controllers/topup.js:306 +#: www/views/buyAmazon.html:29 #: www/views/confirm.html:65 #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 @@ -1158,14 +1234,26 @@ msgstr "通过添加您的第一个开始。" msgid "Getting fee levels..." msgstr "正在获取收费水平..." -#: src/js/controllers/bitpayCard.js:181 -#: src/js/controllers/bitpayCard.js:191 +#: www/views/buyAmazon.html:43 +msgid "Gift card" +msgstr "" + +#: src/js/controllers/buyAmazon.js:203 +msgid "Gift card expired" +msgstr "" + +#: www/views/buyAmazon.html:111 +msgid "Gift card generated and ready to use." +msgstr "" + +#: src/js/controllers/bitpayCard.js:114 +#: src/js/controllers/bitpayCard.js:124 #: 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:149 #: src/js/controllers/tab-settings.js:48 -#: src/js/controllers/tx-details.js:174 +#: src/js/controllers/tx-details.js:176 msgid "Go Back" msgstr "返回 #" @@ -1198,7 +1286,7 @@ msgstr "硬件钱包" msgid "Help & Support" msgstr "帮助与支持" -#: src/js/controllers/bitpayCard.js:179 +#: src/js/controllers/bitpayCard.js:112 #: src/js/controllers/tab-settings.js:46 msgid "Help and support information is available at the website." msgstr "" @@ -1207,7 +1295,7 @@ msgstr "" msgid "Hide" msgstr "隱藏" -#: www/views/preferences.html:32 +#: www/views/preferences.html:27 msgid "Hide Balance" msgstr "隐藏的平衡" @@ -1282,7 +1370,7 @@ msgstr "我明白，我的资金安全地在此设备上，不由公司举行。 msgid "I've written it down" msgstr "我已经把它写下来" -#: www/views/preferences.html:50 +#: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." msgstr "" @@ -1355,12 +1443,14 @@ msgstr "代码格式不正确" msgid "Incorrect network address" msgstr "" +#: src/js/controllers/confirm.js:112 +#: src/js/controllers/confirm.js:275 #: src/js/services/bwcError.js:44 msgid "Insufficient funds" msgstr "资金不足" -#: src/js/controllers/topup.js:159 -#: src/js/controllers/topup.js:171 +#: src/js/controllers/topup.js:164 +#: src/js/controllers/topup.js:176 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" msgstr "费用的资金不足" @@ -1369,7 +1459,8 @@ msgstr "费用的资金不足" msgid "Invalid" msgstr "无效" -#: src/js/controllers/topup.js:109 +#: src/js/controllers/buyAmazon.js:136 +#: src/js/controllers/topup.js:114 msgid "Invalid URL" msgstr "" @@ -1397,6 +1488,7 @@ msgstr "衍生路径无效" msgid "Invitation to share a {{appName}} Wallet" msgstr "邀请分享 {{appName}} 钱包" +#: www/views/buyAmazon.html:49 #: www/views/topup.html:56 msgid "Invoice Fee" msgstr "" @@ -1504,10 +1596,6 @@ msgstr "" msgid "Low fees" msgstr "" -#: www/views/paymentUri.html:13 -msgid "Make a payment to" -msgstr "支付给" - #: www/views/onboarding/tour.html:38 msgid "Makes sense" msgstr "有道理" @@ -1525,7 +1613,7 @@ msgstr "我" msgid "Meh - it's alright" msgstr "咩-没关系" -#: src/js/controllers/tx-details.js:146 +#: src/js/controllers/tx-details.js:148 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:95 #: www/views/tx-details.html:74 @@ -1536,10 +1624,6 @@ msgstr "便签" msgid "Merchant Message" msgstr "商人的消息" -#: www/views/paymentUri.html:17 -msgid "Message" -msgstr "信息" - #: src/js/services/bwcError.js:134 msgid "Missing parameter" msgstr "缺失参数" @@ -1548,7 +1632,7 @@ msgstr "缺失参数" msgid "Missing private keys to sign" msgstr "遗失需要签名的私钥" -#: www/views/preferences.html:65 +#: www/views/preferences.html:60 #: www/views/preferencesAdvanced.html:3 msgid "More Options" msgstr "更多的选择" @@ -1558,7 +1642,7 @@ msgstr "更多的选择" msgid "Moved" msgstr "已调动" -#: src/js/controllers/tx-details.js:112 +#: src/js/controllers/tx-details.js:114 msgid "Moved Funds" msgstr "转移资金" @@ -1577,10 +1661,7 @@ msgstr "注意︰欲从第三方软件导入钱包，请到添加钱包 > 创 msgid "Name" msgstr "名称" -#: www/views/paymentUri.html:18 -msgid "Network" -msgstr "网络" - +#: www/views/buyAmazon.html:55 #: www/views/topup.html:63 msgid "Network Fee" msgstr "" @@ -1609,6 +1690,10 @@ msgstr "接下来的步骤" msgid "No Wallet" msgstr "没钱包" +#: src/js/controllers/buyAmazon.js:114 +msgid "No access key defined" +msgstr "" + #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." msgstr "没有备份，没有比特币。" @@ -1625,7 +1710,7 @@ msgstr "" msgid "No hardware wallets supported on this device" msgstr "此设备不支持硬件钱包" -#: www/views/proposals.html:25 +#: www/views/proposals.html:24 msgid "No pending proposals" msgstr "没有挂起的建议" @@ -1633,7 +1718,8 @@ msgstr "没有挂起的建议" msgid "No recent transactions" msgstr "没有最近的交易" -#: src/js/controllers/topup.js:41 +#: src/js/controllers/buyAmazon.js:43 +#: src/js/controllers/topup.js:46 msgid "No signing proposal: No private key" msgstr "" @@ -1649,7 +1735,9 @@ msgstr "发现没有钱包" msgid "No wallet selected" msgstr "没有选定的钱包" -#: src/js/controllers/topup.js:255 +#: src/js/controllers/buyAmazon.js:298 +#: src/js/controllers/confirm.js:83 +#: src/js/controllers/topup.js:263 msgid "No wallets available" msgstr "" @@ -1665,7 +1753,7 @@ msgstr "常规" msgid "Not authorized" msgstr "尚未授权" -#: src/js/controllers/confirm.js:271 +#: src/js/controllers/confirm.js:276 msgid "Not enough funds for fee" msgstr "费用的资金不足" @@ -1699,10 +1787,14 @@ msgstr "通知" msgid "Notifications by email" msgstr "" -#: www/views/tx-details.html:116 +#: www/views/tx-details.html:117 msgid "Notify me if confirmed" msgstr "" +#: www/views/preferencesNotifications.html:24 +msgid "Notify me when transactions are confirmed" +msgstr "" + #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." msgstr "现在是很好的时间进行备份你的钱包。如果此设备丢失，它是无法访问您没有备份的资金。" @@ -1711,9 +1803,13 @@ msgstr "现在是很好的时间进行备份你的钱包。如果此设备丢失 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" msgstr "现在是一个完美的时间来评估你的周围。附近的窗户吗？隐藏的摄像机？肩-间谍吗？" -#: src/js/controllers/topup.js:276 +#: src/js/controllers/buyAmazon.js:310 +#: src/js/controllers/topup.js:284 #: src/js/services/popupService.js:16 -#: src/js/services/popupService.js:59 +#: src/js/services/popupService.js:52 +#: src/js/services/popupService.js:61 +#: src/js/services/popupService.js:72 +#: www/views/modals/chooseFeeLevel.html:6 msgid "OK" msgstr "好的" @@ -1736,7 +1832,7 @@ msgstr "出错。" msgid "On this screen you can see all your wallets, accounts, and assets." msgstr "在此屏幕上您可以看到您的钱包、 帐户和资产。" -#: src/js/controllers/bitpayCard.js:180 +#: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/tab-settings.js:47 msgid "Open" msgstr "打开" @@ -1753,8 +1849,8 @@ msgstr "打开 GitHub" msgid "Open GitHub Project" msgstr "打开 GitHub 项目" -#: src/js/controllers/bitpayCard.js:190 -#: src/js/controllers/tx-details.js:173 +#: src/js/controllers/bitpayCard.js:123 +#: src/js/controllers/tx-details.js:175 msgid "Open Insight" msgstr "开放的洞察力" @@ -1774,6 +1870,10 @@ msgstr "打开网站" msgid "Open wallet" msgstr "打开钱包" +#: www/views/includes/incomingDataMenu.html:19 +msgid "Open website" +msgstr "" + #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" msgstr "订单 BitPay 卡" @@ -1809,6 +1909,7 @@ msgstr "0%付费以比特币变成美元。" msgid "Pay To" msgstr "支付给" +#: src/js/controllers/modals/txpDetails.js:45 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" msgstr "已接受支付" @@ -1846,9 +1947,9 @@ msgstr "收到付款" msgid "Payment Rejected" msgstr "支付被拒绝" +#: src/js/controllers/modals/txpDetails.js:42 #: www/views/confirm.html:126 #: www/views/includes/walletActivity.html:11 -#: www/views/modals/txp-details.html:188 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" msgstr "支付已发送" @@ -1869,7 +1970,7 @@ msgstr "支付明细" msgid "Payment request" msgstr "支付请求" -#: www/views/proposals.html:5 +#: www/views/proposals.html:4 msgid "Pending Proposals" msgstr "支付提议" @@ -1930,7 +2031,7 @@ msgstr "正在准备地址..." msgid "Preparing backup..." msgstr "正在准备备份..." -#: src/js/routes.js:1196 +#: src/js/routes.js:1188 msgid "Press again to exit" msgstr "再按一次退出" @@ -1938,6 +2039,10 @@ msgstr "再按一次退出" msgid "Priority" msgstr "优先" +#: www/views/includes/incomingDataMenu.html:80 +msgid "Private Key" +msgstr "" + #: src/js/controllers/paperWallet.js:137 msgid "Private key encrypted. Enter password" msgstr "私钥加密。输入密码" @@ -1950,8 +2055,8 @@ msgstr "私钥已加密，无法签名" msgid "Proposal Accepted" msgstr "提案被接受" -#: src/js/controllers/modals/txpDetails.js:51 -#: src/js/controllers/tx-details.js:59 +#: src/js/controllers/modals/txpDetails.js:55 +#: src/js/controllers/tx-details.js:61 #: www/views/confirm.html:127 msgid "Proposal Created" msgstr "建议创建" @@ -1968,6 +2073,10 @@ msgstr "被拒绝的建议" msgid "Proposals" msgstr "建议" +#: src/js/controllers/buyAmazon.js:281 +msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" + #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" msgstr "推式通知" @@ -2006,12 +2115,16 @@ msgstr "阅读更多" msgid "Receive" msgstr "接收" +#: www/views/customAmount.html:46 +msgid "Receive in" +msgstr "" + #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" msgstr "已接收" -#: src/js/controllers/tx-details.js:111 +#: src/js/controllers/tx-details.js:113 msgid "Received Funds" msgstr "收到的资金" @@ -2056,8 +2169,8 @@ msgstr "重新创建" msgid "Recreating Wallet..." msgstr "正在重新创建的钱包..." -#: src/js/controllers/modals/txpDetails.js:53 -#: src/js/controllers/tx-details.js:61 +#: src/js/controllers/modals/txpDetails.js:57 +#: src/js/controllers/tx-details.js:63 msgid "Rejected" msgstr "拒绝" @@ -2099,7 +2212,7 @@ msgstr "重复输入密码" msgid "Repeat the password" msgstr "重复密码" -#: www/views/preferences.html:60 +#: www/views/preferences.html:55 msgid "Request Fingerprint" msgstr "请求指纹" @@ -2107,7 +2220,7 @@ msgstr "请求指纹" msgid "Request Specific amount" msgstr "请求特定量" -#: www/views/preferences.html:47 +#: www/views/preferences.html:42 msgid "Request Spending Password" msgstr "请求支付密码" @@ -2135,7 +2248,7 @@ msgstr "重试相机" #: www/views/includes/note.html:9 #: www/views/preferencesAlias.html:21 #: www/views/preferencesBwsUrl.html:25 -#: www/views/preferencesNotifications.html:40 +#: www/views/preferencesNotifications.html:46 msgid "Save" msgstr "保存" @@ -2184,7 +2297,7 @@ msgstr "搜索交易" msgid "Search your currency" msgstr "搜索您的货币" -#: www/views/preferences.html:35 +#: www/views/preferences.html:30 msgid "Security" msgstr "安全" @@ -2193,7 +2306,6 @@ msgid "Select a backup file" msgstr "选择备份文件" #: src/js/controllers/tab-receive.js:133 -#: www/views/paymentUri.html:30 msgid "Select a wallet" msgstr "选择钱包" @@ -2230,7 +2342,7 @@ msgstr "通过电邮发送地址" msgid "Send by email" msgstr "通过电邮发送" -#: src/js/controllers/confirm.js:148 +#: src/js/controllers/confirm.js:151 msgid "Send from" msgstr "从发送" @@ -2238,6 +2350,10 @@ msgstr "从发送" msgid "Send max amount" msgstr "发送最大数量" +#: www/views/includes/incomingDataMenu.html:46 +msgid "Send payment to this address" +msgstr "" + #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" msgstr "而是向我们发送反馈" @@ -2265,7 +2381,7 @@ msgstr "发送的最大金额" msgid "Sending transaction" msgstr "正在发送交易" -#: src/js/controllers/confirm.js:486 +#: src/js/controllers/confirm.js:490 msgid "Sending {{amountStr}} from your {{name}} wallet" msgstr "从你的 {{name}} 钱包发送 {{amountStr}}" @@ -2276,7 +2392,7 @@ msgstr "从你的 {{name}} 钱包发送 {{amountStr}}" msgid "Sent" msgstr "已发送" -#: src/js/controllers/tx-details.js:110 +#: src/js/controllers/tx-details.js:112 msgid "Sent Funds" msgstr "已发送的资金" @@ -2284,6 +2400,10 @@ msgstr "已发送的资金" msgid "Server response could not be verified" msgstr "无法验证服务器响应" +#: src/js/controllers/buyAmazon.js:96 +msgid "Service not available" +msgstr "" + #: www/views/includes/homeIntegrations.html:3 msgid "Services" msgstr "服务" @@ -2300,6 +2420,10 @@ msgstr "会话日志" msgid "Set up a password" msgstr "设置密码" +#: src/js/controllers/preferencesFee.js:84 +msgid "Set your own fee in satoshis/byte" +msgstr "" + #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" @@ -2310,7 +2434,7 @@ msgstr "设置" msgid "Share the love by inviting your friends." msgstr "邀请您的朋友分享爱。" -#: www/views/copayers.html:21 +#: www/views/copayers.html:20 msgid "Share this invitation with your copayers" msgstr "将此邀请与你的 copayers 共享" @@ -2371,10 +2495,14 @@ msgstr "单一地址钱包" msgid "Skip" msgstr "跳过" -#: src/js/controllers/modals/txpDetails.js:33 +#: src/js/controllers/modals/txpDetails.js:34 msgid "Slide" msgstr "滑动" +#: www/views/buyAmazon.html:96 +msgid "Slide to buy" +msgstr "" + #: src/js/controllers/create.js:83 #: src/js/controllers/join.js:68 msgid "Specify Recovery Phrase..." @@ -2400,10 +2528,6 @@ msgstr "" msgid "Start sending bitcoin" msgstr "开始发送比特币" -#: src/js/routes.js:118 -msgid "Starting..." -msgstr "正在启动..." - #: www/views/lockSetup.html:3 msgid "Startup Lock" msgstr "" @@ -2420,6 +2544,7 @@ msgstr "超级经济" msgid "Sweep" msgstr "扫描" +#: www/views/includes/incomingDataMenu.html:89 #: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "Sweep 纸钱包" @@ -2462,6 +2587,10 @@ msgstr "使用条款" msgid "Testnet" msgstr "Testnet" +#: www/views/includes/incomingDataMenu.html:61 +msgid "Text" +msgstr "" + #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 @@ -2556,10 +2685,6 @@ msgstr "在应用程序缓存的交易历史记录和每个新传入事务。此 msgid "The wallet service URL" msgstr "钱包服务 URL" -#: www/views/paymentUri.html:23 -msgid "There are no wallets to make this payment" -msgstr "没有钱包以进行此支付" - #: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" msgstr "有可用的新版本的 {{appName}}" @@ -2583,7 +2708,7 @@ msgstr "这个应用程序太棒了 ！" msgid "This app stores your bitcoin with cutting-edge security." msgstr "此应用程序商店你比特币与尖端的安全。" -#: src/js/controllers/confirm.js:464 +#: src/js/controllers/confirm.js:468 msgid "This bitcoin payment request has expired." msgstr "这比特币付款请求已过期。" @@ -2611,7 +2736,7 @@ msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). msgstr "此钱包不在给定的 Bitcore Wallet Service (BWS) 注册。你可以从本地信息重新创建它。" #: www/views/modals/txp-details.html:138 -#: www/views/tx-details.html:119 +#: www/views/tx-details.html:121 msgid "Timeline" msgstr "时间轴" @@ -2640,10 +2765,11 @@ msgstr "" msgid "Top up in progress..." msgstr "" -#: src/js/controllers/topup.js:198 +#: src/js/controllers/topup.js:205 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "" +#: www/views/buyAmazon.html:61 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" @@ -2666,10 +2792,14 @@ msgstr "" msgid "Touch ID Failed" msgstr "触摸 ID 失败" -#: src/js/controllers/tx-details.js:10 +#: src/js/controllers/tx-details.js:11 msgid "Transaction" msgstr "交易" +#: www/views/confirm.html:128 +msgid "Transaction Created" +msgstr "" + #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" @@ -2679,11 +2809,8 @@ msgstr "交易历史记录" msgid "Transaction already broadcasted" msgstr "交易已经广播" -#: www/views/confirm.html:128 -msgid "Transaction created" -msgstr "创建的交易记录" - -#: src/js/controllers/topup.js:271 +#: src/js/controllers/buyAmazon.js:306 +#: src/js/controllers/topup.js:279 msgid "Transaction has not been created" msgstr "" @@ -2691,7 +2818,7 @@ msgstr "" msgid "Transaction initiated" msgstr "" -#: src/js/controllers/tx-details.js:100 +#: src/js/controllers/tx-details.js:102 msgid "Transaction not available at this time" msgstr "" @@ -2700,6 +2827,10 @@ msgstr "" msgid "Transaction not found" msgstr "找不到交易" +#: www/views/modals/chooseFeeLevel.html:54 +msgid "Transactions without fee are not supported." +msgstr "" + #: src/js/controllers/paperWallet.js:110 msgid "Transfer to" msgstr "" @@ -2748,7 +2879,7 @@ msgstr "未使用的地址" msgid "Update Available" msgstr "可用的更新" -#: www/views/proposals.html:15 +#: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" msgstr "正在更新挂起的建议。请袖手旁观" @@ -2793,8 +2924,8 @@ msgstr "查看所有地址" msgid "View Terms of Service" msgstr "查看服务条款" -#: src/js/controllers/bitpayCard.js:189 -#: src/js/controllers/tx-details.js:172 +#: src/js/controllers/bitpayCard.js:122 +#: src/js/controllers/tx-details.js:174 msgid "View Transaction on Insight" msgstr "查看交易记录的洞察" @@ -2802,7 +2933,7 @@ msgstr "查看交易记录的洞察" msgid "View Update" msgstr "查看更新" -#: www/views/tx-details.html:145 +#: www/views/tx-details.html:147 msgid "View on blockchain" msgstr "在 blockchain 上查看" @@ -2830,11 +2961,11 @@ msgstr "正在等待 Ledger..." msgid "Waiting for Trezor..." msgstr "正在等待 Trezor..." -#: www/views/copayers.html:49 +#: www/views/copayers.html:48 msgid "Waiting for copayers" msgstr "正在等待 copayers" -#: www/views/copayers.html:54 +#: www/views/copayers.html:53 msgid "Waiting..." msgstr "等待中..." @@ -2926,7 +3057,7 @@ msgstr "钱包已经在 Copay" msgid "Wallet created" msgstr "创建的钱包" -#: www/views/copayers.html:59 +#: www/views/copayers.html:58 msgid "Wallet incomplete and broken" msgstr "钱包不完整和损坏" @@ -2985,8 +3116,8 @@ msgid "Wallets & Integrations" msgstr "钱包 & 集成" #: src/js/controllers/addressbookView.js:23 -#: src/js/controllers/modals/txpDetails.js:143 -#: src/js/controllers/modals/txpDetails.js:160 +#: src/js/controllers/modals/txpDetails.js:147 +#: src/js/controllers/modals/txpDetails.js:164 #: src/js/controllers/preferencesDelete.js:25 #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 @@ -3017,6 +3148,10 @@ msgstr "" msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" msgstr "" +#: www/views/includes/incomingDataMenu.html:6 +msgid "Website" +msgstr "" + #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." msgstr "我们一直在寻找翻译的贡献 ！你可以作出更正或帮助使这个应用程序在你的母语中可用 Crowdin 上加入我们的社区。" @@ -3093,11 +3228,15 @@ msgstr "你可以换其他货币，如美元、 欧元或英镑。" msgid "You control your bitcoin." msgstr "您可以控制您的比特币。" +#: www/views/modals/chooseFeeLevel.html:63 +msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" + #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." msgstr "" -#: www/views/preferencesNotifications.html:28 +#: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." msgstr "在您的钱包进行付款操作时发送通知。" @@ -3113,6 +3252,10 @@ msgstr "你的比特币钱包被备份 ！" msgid "Your bitcoin wallet is ready!" msgstr "你的比特币钱包是准备好了 ！" +#: www/views/modals/chooseFeeLevel.html:60 +msgid "Your fee is lower than recommended." +msgstr "" + #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" msgstr "你的想法、 反馈或评论" @@ -3130,6 +3273,14 @@ msgstr "你的昵称" msgid "Your password" msgstr "你的密码" +#: www/views/buyAmazon.html:102 +msgid "Your purchase could not be completed" +msgstr "" + +#: www/views/buyAmazon.html:105 +msgid "Your purchase was added to the list of pending" +msgstr "" + #: www/views/onboarding/backupRequest.html:10 msgid "Your wallet is never saved to cloud storage or standard device backups." msgstr "你的钱包是永远不会保存到云存储或标准设备备份。" @@ -3167,25 +3318,29 @@ msgstr "name@example.com" msgid "preparing..." msgstr "准备中..." -#: src/js/controllers/confirm.js:325 -#: src/js/controllers/modals/txpDetails.js:42 +#: src/js/controllers/confirm.js:329 +#: src/js/controllers/modals/txpDetails.js:44 msgid "to accept" msgstr "接受" -#: src/js/controllers/confirm.js:323 +#: src/js/controllers/confirm.js:327 msgid "to pay" msgstr "付款" -#: src/js/controllers/confirm.js:327 -#: src/js/controllers/modals/txpDetails.js:40 +#: src/js/controllers/confirm.js:331 +#: src/js/controllers/modals/txpDetails.js:41 msgid "to send" msgstr "发送" +#: src/js/controllers/buyAmazon.js:238 +msgid "{{amountStr}} for Amazon.com Gift Card" +msgstr "" + #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." msgstr "{{appName}} 中的区块链信息依赖于 Bitcore Wallet Service (BWS)、网络和 Copayer synchronization。默认配置指向 https://bws.bitpay.com (BitPay 的公共 BWS 实例)。" -#: src/js/controllers/confirm.js:354 +#: src/js/controllers/confirm.js:358 msgid "{{fee}} will be deducted for bitcoin networking fees." msgstr "{{fee}} 将比特币网络费用中扣除。" @@ -3197,7 +3352,7 @@ msgstr "" msgid "{{updatingTxHistoryProgress}} transactions downloaded" msgstr "下载的 {{updatingTxHistoryProgress}} 交易" -#: www/views/copayers.html:47 +#: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:12 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "{{wallet.m}}{{wallet.n}}" diff --git a/src/js/controllers/amazonCards.js b/src/js/controllers/amazonCards.js index c0e42b791..42bef3fd7 100644 --- a/src/js/controllers/amazonCards.js +++ b/src/js/controllers/amazonCards.js @@ -51,8 +51,8 @@ angular.module('copayApp.controllers').controller('amazonCardsController', remove: true }, function(err) { updateGiftCards(); - return; }); + return; } amazonService.savePendingGiftCard(newData, null, function(err) { @@ -85,11 +85,11 @@ angular.module('copayApp.controllers').controller('amazonCardsController', }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.cardClaimCode = data.stateParams.cardClaimCode; + $scope.invoiceId = data.stateParams.invoiceId; updateGiftCards(function() { - if ($scope.cardClaimCode) { + if ($scope.invoiceId) { var card = lodash.find($scope.giftCards, { - claimCode: $scope.cardClaimCode + invoiceId: $scope.invoiceId }); if (lodash.isEmpty(card)) { popupService.showAlert(null, 'Card not found'); diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 27efc7d0a..55e2b14aa 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -3,7 +3,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, moment, popupService, gettextCatalog, $ionicHistory, bitpayService, externalLinkService, timeService) { var self = this; - var runningBalance; $scope.dateRange = { value: 'last30Days' }; @@ -63,8 +62,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi self.bitpayCardTransactionHistoryCompleted = null; self.bitpayCardTransactionHistoryConfirming = null; self.bitpayCardTransactionHistoryPreAuth = null; - self.underpaidInvoiceInList = null; - self.delayedInvoiceInList = null; self.balance = null; popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not get transactions')); return; @@ -73,42 +70,10 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi setGetStarted(history, function() { var txs = lodash.clone(history.txs); - runningBalance = parseFloat(history.endingBalance); - for (var i = 0; i < txs.length; i++) { - txs[i] = _getMerchantInfo(txs[i]); - txs[i].icon = _getIconName(txs[i]); - txs[i].desc = _processDescription(txs[i]); - txs[i].price = _price(txs[i]); - txs[i].runningBalance = runningBalance; - txs[i].pending = txs[i].status.toLowerCase() == 'pending'; - _runningBalance(txs[i]); - - if (txs[i].merchant.city && txs[i].merchant.state) { - txs[i].merchant.location = txs[i].merchant.city + ', ' + txs[i].merchant.state; - } else { - txs[i].merchant.location = txs[i].merchant.city || txs[i].merchant.state || ''; - } - } - self.bitpayCardTransactionHistoryCompleted = lodash.filter(txs, function(tx) { - return !tx.pending && tx.type.indexOf('93') == -1; - }); - self.bitpayCardTransactionHistoryConfirming = lodash.filter(txs, function(tx) { - return tx.pending && tx.type.indexOf('93') == -1; - }); - self.bitpayCardTransactionHistoryPreAuth = lodash.filter(txs, function(tx) { - return tx.pending && tx.type.indexOf('93') > -1; - }); - - lodash.forEach(self.bitpayCardTransactionHistoryConfirming, function(tx) { - if (lodash.includes(tx, 'paidPartial')) - self.underpaidInvoiceInList = true; - }); - - lodash.forEach(self.bitpayCardTransactionHistoryConfirming, function(tx) { - if (lodash.includes(tx, 'paid') || lodash.includes(tx, 'invalid')) - self.delayedInvoiceInList = true; - }); + self.bitpayCardTransactionHistoryConfirming = bitpayCardService.filterTransactions('confirming', txs); + self.bitpayCardTransactionHistoryCompleted = bitpayCardService.filterTransactions('completed', txs); + self.bitpayCardTransactionHistoryPreAuth = bitpayCardService.filterTransactions('preAuth', txs); self.balance = history.currentCardBalance; self.updatedOn = null; @@ -133,42 +98,10 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }); }; - var _getMerchantInfo = function(tx) { - var bpTranCodes = bitpayCardService.bpTranCodes; - lodash.keys(bpTranCodes).forEach(function(code) { - if (tx.type.indexOf(code) === 0) { - lodash.assign(tx, bpTranCodes[code]); - } - }); - return tx; - }; - - var _getIconName = function(tx) { - var icon = tx.mcc || tx.category || null; - if (!icon || bitpayCardService.iconMap[icon] == undefined) return 'default'; - return bitpayCardService.iconMap[icon]; - }; - - var _processDescription = function(tx) { - if (lodash.isArray(tx.description)) { - return tx.description[0]; - } - return tx.description; - }; - - var _price = function(tx) { - var price = tx.fee ? parseFloat(tx.amount) + parseFloat(tx.fee) : parseFloat(tx.amount); - return price; - }; - - var _runningBalance = function(tx) { - runningBalance -= parseFloat(tx.amount); - }; - $scope.createdWithinPastDay = function(tx) { var result = false; - if (tx.timestamp) { - result = timeService.withinPastDay(tx.timestamp); + if (tx.date) { + result = timeService.withinPastDay(tx.date); } return result; }; diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index 15fe08aab..b063126cc 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -1,34 +1,46 @@ 'use strict'; -angular.module('copayApp.controllers').controller('buyAmazonController', function($scope, $log, $state, $timeout, $filter, $ionicHistory, $ionicConfig, lodash, amazonService, popupService, profileService, ongoingProcess, configService, walletService, payproService, bwcError, externalLinkService, platformInfo) { +angular.module('copayApp.controllers').controller('buyAmazonController', function($scope, $log, $state, $timeout, $filter, $ionicHistory, $ionicConfig, lodash, amazonService, popupService, profileService, ongoingProcess, configService, walletService, payproService, bwcError, externalLinkService, platformInfo, gettextCatalog, txFormatService) { var amount; var currency; - $scope.isCordova = platformInfo.isCordova; + var createdTx; + var message; + var invoiceId; + var configWallet = configService.getSync().wallet; + $scope.isCordova = platformInfo.isCordova; $scope.openExternalLink = function(url) { externalLinkService.open(url); }; - var showErrorAndBack = function(msg, err) { + var _resetValues = function() { + $scope.totalAmountStr = $scope.amount = $scope.invoiceFee = $scope.networkFee = $scope.totalAmount = $scope.wallet = null; + createdTx = message = invoiceId = null; + }; + + var showErrorAndBack = function(title, msg) { + title = title || gettextCatalog.getString('Error'); $scope.sendStatus = ''; - $log.error(err); - err = err && err.errors ? err.errors[0].message : err; - popupService.showAlert(msg, err, function() { + $log.error(msg); + msg = (msg && msg.errors) ? msg.errors[0].message : msg; + popupService.showAlert(title, msg, function() { $ionicHistory.goBack(); }); }; - var showError = function(msg, err) { + var showError = function(title, msg, cb) { + cb = cb || function() {}; + title = title || gettextCatalog.getString('Error'); $scope.sendStatus = ''; - $log.error(err); - err = err && err.errors ? err.errors[0].message : (err || ''); - popupService.showAlert(msg, err); + $log.error(msg); + msg = (msg && msg.errors) ? msg.errors[0].message : msg; + popupService.showAlert(title, msg, cb); }; 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); } @@ -51,6 +63,111 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio } }; + var satToFiat = function(sat, cb) { + txFormatService.toFiat(sat, $scope.currencyIsoCode, function(value) { + return cb(value); + }); + }; + + var setTotalAmount = function(amountSat, invoiceFeeSat, networkFeeSat) { + satToFiat(amountSat, function(a) { + $scope.amount = Number(a); + + 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) { + amazonService.createBitPayInvoice(data, function(err, dataInvoice) { + if (err) { + var err_title = gettextCatalog.getString('Error creating the invoice'); + var err_msg; + if (err && err.message && err.message.match(/suspended/i)) { + err_title = gettextCatalog.getString('Service not available'); + err_msg = gettextCatalog.getString('Amazon.com is not available at this moment. Please try back later.'); + } else if (err && err.message) { + err_msg = err.message; + } else { + err_msg = gettextCatalog.getString('Could not access to Amazon.com'); + }; + + return cb({ + title: err_title, + message: err_msg + }); + } + + var accessKey = dataInvoice ? dataInvoice.accessKey : null; + + if (!accessKey) { + return cb({ + message: gettextCatalog.getString('No access key defined') + }); + } + + amazonService.getBitPayInvoice(dataInvoice.invoiceId, function(err, invoice) { + if (err) { + return cb({ + message: gettextCatalog.getString('Could not get the invoice') + }); + } + + return cb(null, invoice, accessKey); + }); + }); + }; + + 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 outputs = []; + var toAddress = invoice.bitcoinAddress; + var amountSat = parseInt((invoice.btcDue * 100000000).toFixed(0)); // BTC to Satoshi + + outputs.push({ + 'toAddress': toAddress, + 'amount': amountSat, + 'message': message + }); + + 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 checkTransaction = lodash.throttle(function(count, dataSrc) { amazonService.createGiftCard(dataSrc, function(err, giftCard) { $log.debug("creating gift card " + count); @@ -58,7 +175,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); giftCard = {}; giftCard.status = 'FAILURE'; - showError('Error creating gift card', err); + showError(gettextCatalog.getString('Error creating gift card'), err); } if (giftCard.status == 'PENDING' && count < 3) { @@ -83,9 +200,9 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio }, function(err) { $log.error(err); ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); - showError('Gift card expired'); - return; + showError(null, gettextCatalog.getString('Gift card expired')); }); + return; } amazonService.savePendingGiftCard(newData, null, function(err) { @@ -98,6 +215,57 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio 'leading': true }); + var initialize = function(wallet) { + var parsedAmount = txFormatService.parseAmount(amount, currency); + $scope.currencyIsoCode = parsedAmount.alternativeIsoCode; + $scope.amountUnitStr = parsedAmount.amountUnitStr; + var dataSrc = { + amount: parsedAmount.amount, + currency: parsedAmount.currency, + uuid: wallet.id + }; + ongoingProcess.set('loadingTxInfo', true); + createInvoice(dataSrc, function(err, invoice, accessKey) { + if (err) { + ongoingProcess.set('loadingTxInfo', false); + showErrorAndBack(err.title, err.message); + return; + } + // Sometimes API does not return this element; + invoice['buyerPaidBtcMinerFee'] = invoice.buyerPaidBtcMinerFee || 0; + var invoiceFeeSat = (invoice.buyerPaidBtcMinerFee * 100000000).toFixed(); + + message = gettextCatalog.getString("{{amountStr}} for Amazon.com Gift Card", { + amountStr: $scope.amountUnitStr + }); + + createTx(wallet, invoice, message, function(err, ctxp) { + ongoingProcess.set('loadingTxInfo', false); + if (err) { + _resetValues(); + showError(err.title, err.message); + return; + } + + // Save in memory + createdTx = ctxp; + invoiceId = invoice.id; + + createdTx['giftData'] = { + currency: dataSrc.currency, + amount: dataSrc.amount, + uuid: dataSrc.uuid, + accessKey: accessKey, + invoiceId: invoice.id, + invoiceUrl: invoice.url, + invoiceTime: invoice.invoiceTime + }; + $scope.totalAmountStr = txFormatService.formatAmountStr(ctxp.amount); + setTotalAmount(parsedAmount.amountSat, invoiceFeeSat, ctxp.fee); + }); + }); + }; + $scope.$on("$ionicView.beforeLeave", function(event, data) { $ionicConfig.views.swipeBackEnabled(true); }); @@ -110,13 +278,16 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio amount = data.stateParams.amount; currency = data.stateParams.currency; - if (amount > 1000) { - showErrorAndBack('Purchase Amount is limited to USD 1000 per day'); + $scope.limitPerDayMessage = gettextCatalog.getString('Purchase Amount is limited to {{limitPerDay}} {{currency}} per day', { + limitPerDay: amazonService.limitPerDay, + currency: currency + }); + + if (amount > amazonService.limitPerDay) { + showErrorAndBack(null, $scope.limitPerDayMessage); return; } - $scope.amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency; - $scope.network = amazonService.getNetwork(); $scope.wallets = profileService.getWallets({ onlyComplete: true, @@ -124,135 +295,47 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio hasFunds: true }); if (lodash.isEmpty($scope.wallets)) { - showErrorAndBack('No wallets with funds'); + showErrorAndBack(null, gettextCatalog.getString('No wallets available')); return; } - $scope.wallet = $scope.wallets[0]; // Default first wallet + $scope.onWalletSelect($scope.wallets[0]); // Default first wallet }); $scope.buyConfirm = function() { - - var message = 'Buy gift card for ' + amount + ' ' + currency; - var okText = 'Confirm'; - var cancelText = 'Cancel'; - popupService.showConfirm(null, message, okText, cancelText, function(ok) { - if (!ok) return; - - var config = configService.getSync(); - var configWallet = config.wallet; - var walletSettings = configWallet.settings; - // Get first wallet as UUID - var uuid = $scope.wallet.id; - var dataSrc = { - currency: currency, - amount: amount, - uuid: uuid - }; + if (!createdTx) { + showError(null, gettextCatalog.getString('Transaction has not been created')); + 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; + } ongoingProcess.set('buyingGiftCard', true, statusChangeHandler); - amazonService.createBitPayInvoice(dataSrc, function(err, dataInvoice) { + publishAndSign($scope.wallet, createdTx, function() {}, function(err, txSent) { if (err) { + _resetValues(); ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); - - if (err && err.message && err.message.match(/suspended/i)) { - showError('Service not available', 'Amazon Gift Card Service is not available at this moment. Please try back later.'); - } else { - showError('Could not access Gift Card Service', err); - }; - + showError(gettextCatalog.getString('Could not send transaction'), err); return; } - - var accessKey = dataInvoice ? dataInvoice.accessKey : null; - - if (!accessKey) { - ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); - showError('No access key defined'); - return; - } - - amazonService.getBitPayInvoice(dataInvoice.invoiceId, function(err, invoice) { - if (err) { - ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); - showError('Error getting BitPay invoice', err); - return; - } - - var payProUrl = (invoice && invoice.paymentUrls) ? invoice.paymentUrls.BIP73 : null; - - if (!payProUrl) { - ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); - showError('Error fetching invoice'); - return; - } - - payproService.getPayProDetails(payProUrl, function(err, payProDetails) { - if (err) { - ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); - showError('Error fetching payment info', bwcError.msg(err)); - return; - } - - var outputs = []; - var toAddress = payProDetails.toAddress; - var amountSat = payProDetails.amount; - var comment = amount + ' ' + currency + ' Amazon.com Gift Card'; - - 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('buyingGiftCard', false, statusChangeHandler); - showError('Could not create transaction', bwcError.msg(err)); - return; - } - publishAndSign($scope.wallet, ctxp, function() {}, function(err, txSent) { - if (err) { - ongoingProcess.set('buyingGiftCard', false, statusChangeHandler); - showError('Could not send transaction', err); - return; - } - $log.debug('Transaction broadcasted. Waiting for confirmation...'); - var invoiceId = JSON.parse(payProDetails.merchant_data).invoiceId; - var dataSrc = { - currency: currency, - amount: amount, - uuid: uuid, - accessKey: accessKey, - invoiceId: invoice.id, - invoiceUrl: payProUrl, - invoiceTime: invoice.invoiceTime - }; - checkTransaction(1, dataSrc); - }); - }); - }, true); // Disable loader - }); + checkTransaction(1, createdTx.giftData); }); }); }; $scope.showWalletSelector = function() { - $scope.walletSelectorTitle = 'Buy from'; + $scope.walletSelectorTitle = gettextCatalog.getString('Buy from'); $scope.showWallets = true; }; $scope.onWalletSelect = function(wallet) { $scope.wallet = wallet; + initialize(wallet); }; $scope.goBackHome = function() { @@ -262,14 +345,13 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio historyRoot: true }); $ionicHistory.clearHistory(); - var claimCode = $scope.amazonGiftCard ? $scope.amazonGiftCard.claimCode : null; $state.go('tabs.home').then(function() { $ionicHistory.nextViewOptions({ disableAnimate: true }); $state.transitionTo('tabs.giftcards.amazon').then(function() { $state.transitionTo('tabs.giftcards.amazon.cards', { - cardClaimCode: claimCode + invoiceId: invoiceId }); }); }); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 2e408d123..eff5aa4b2 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,6 +1,6 @@ '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) { +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, txConfirmNotification) { var countDown = null; var CONFIRM_LIMIT_USD = 20; @@ -22,6 +22,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( var isCordova = platformInfo.isCordova; var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + //custom fee flag + var usingCustomFee = null; + function refresh() { $timeout(function() { $scope.$apply(); @@ -57,7 +60,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( function setNoWallet(msg) { $scope.wallet = null; - $scope.noWalletMessage = gettextCatalog.getString(msg); + $scope.noWalletMessage = msg; $log.warn('Not ready to make the payment:' + msg); $timeout(function() { $scope.$apply(); @@ -77,7 +80,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); if (!$scope.wallets || !$scope.wallets.length) { - setNoWallet('No wallets available'); + setNoWallet(gettextCatalog.getString('No wallets available')); return cb(); } @@ -106,7 +109,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( return cb('Could not update any wallet'); if (lodash.isEmpty(filteredWallets)) { - setNoWallet('Insufficent funds'); + setNoWallet(gettextCatalog.getString('Insufficient funds')); } $scope.wallets = lodash.clone(filteredWallets); return cb(); @@ -202,7 +205,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( txp.inputs = tx.sendMaxInfo.inputs; txp.fee = tx.sendMaxInfo.fee; } else { - txp.feeLevel = tx.feeLevel; + if (usingCustomFee) { + txp.feePerKb = tx.feeRate; + } else txp.feeLevel = tx.feeLevel; } txp.message = tx.description; @@ -245,12 +250,12 @@ angular.module('copayApp.controllers').controller('confirmController', function( refresh(); // End of quick refresh, before wallet is selected. - if (!wallet)return cb(); + if (!wallet) return cb(); feeService.getFeeRate(tx.network, tx.feeLevel, function(err, feeRate) { if (err) return cb(err); - tx.feeRate = feeRate; + if (!usingCustomFee) tx.feeRate = feeRate; tx.feeLevelName = feeService.feeOpts[tx.feeLevel]; if (!wallet) @@ -267,7 +272,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $log.debug('Send max info', sendMaxInfo); if (tx.sendMax && sendMaxInfo.amount == 0) { - setNoWallet('Insufficent funds'); + setNoWallet(gettextCatalog.getString('Insufficient funds')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee')); return cb('no_funds'); } @@ -294,8 +299,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( var per = (txp.fee / (txp.amount + txp.fee) * 100); txp.feeRatePerStr = per.toFixed(2) + '%'; - txp.feeToHigh = per > FEE_TOO_HIGH_LIMIT_PER; - + txp.feeToHigh = per > FEE_TOO_HIGH_LIMIT_PER; tx.txp[wallet.id] = txp; $log.debug('Confirm. TX Fully Updated for wallet:' + wallet.id, tx); @@ -505,6 +509,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( walletService.publishAndSign(wallet, txp, function(err, txp) { if (err) return setSendError(err); + if (config.confirmedTxsNotifications && config.confirmedTxsNotifications.enabled) { + txConfirmNotification.subscribe(wallet, { + txid: txp.txid + }); + } }, onSendStatusChange); }; @@ -559,8 +568,15 @@ angular.module('copayApp.controllers').controller('confirmController', function( scope.feeLevel = tx.feeLevel; scope.noSave = true; + if (usingCustomFee) { + scope.customFeePerKB = tx.feeRate; + scope.feePerSatByte = tx.feeRate / 1000; + } + $ionicModal.fromTemplateUrl('views/modals/chooseFeeLevel.html', { scope: scope, + backdropClickToClose: false, + hardwareBackButtonClose: false }).then(function(modal) { scope.chooseFeeLevelModal = modal; scope.openModal(); @@ -569,18 +585,21 @@ angular.module('copayApp.controllers').controller('confirmController', function( scope.chooseFeeLevelModal.show(); }; - scope.hideModal = function(customFeeLevel) { + scope.hideModal = function(newFeeLevel, customFeePerKB) { scope.chooseFeeLevelModal.hide(); - $log.debug('Custom fee level choosen:' + customFeeLevel + ' was:' + tx.feeLevel); - if (tx.feeLevel == customFeeLevel) - return; + $log.debug('New fee level choosen:' + newFeeLevel + ' was:' + tx.feeLevel); + + usingCustomFee = newFeeLevel == 'custom' ? true : false; + + if (tx.feeLevel == newFeeLevel && !usingCustomFee) return; + + tx.feeLevel = newFeeLevel; + if (usingCustomFee) tx.feeRate = parseInt(customFeePerKB); - tx.feeLevel = customFeeLevel; updateTx(tx, wallet, { clearCache: true, - dryRun: true, - }, function() { - }); + dryRun: true + }, function() {}); }; }; diff --git a/src/js/controllers/modals/feeLevels.js b/src/js/controllers/modals/feeLevels.js new file mode 100644 index 000000000..72a3e2abf --- /dev/null +++ b/src/js/controllers/modals/feeLevels.js @@ -0,0 +1,119 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('feeLevelsController', function($scope, $timeout, $log, lodash, gettextCatalog, configService, feeService, ongoingProcess, popupService) { + + var FEE_MULTIPLIER = 10; + var FEE_MIN = 0; + + var showErrorAndClose = function(title, msg) { + title = title || gettextCatalog.getString('Error'); + $log.error(msg); + popupService.showAlert(title, msg, function() { + $scope.chooseFeeLevelModal.hide(); + }); + + }; + + var getMinRecommended = function() { + var value = lodash.find($scope.feeLevels[$scope.network], { + level: 'superEconomy' + }); + return parseInt((value.feePerKB / 1000).toFixed()); + }; + + var getMaxRecommended = function() { + var value = lodash.find($scope.feeLevels[$scope.network], { + level: 'urgent' + }); + return parseInt((value.feePerKB / 1000).toFixed()); + }; + + $scope.ok = function() { + $scope.customFeePerKB = $scope.customFeePerKB ? ($scope.customSatPerByte.value * 1000).toFixed() : null; + $scope.hideModal($scope.feeLevel, $scope.customFeePerKB); + }; + + $scope.setFeesRecommended = function() { + $scope.maxFeeRecommended = getMaxRecommended(); + $scope.minFeeRecommended = getMinRecommended(); + $scope.minFeeAllowed = FEE_MIN; + $scope.maxFeeAllowed = $scope.maxFeeRecommended * FEE_MULTIPLIER; + }; + + $scope.checkFees = function(feePerSatByte) { + var fee = Number(feePerSatByte); + + if (fee <= $scope.minFeeAllowed) $scope.showError = true; + else $scope.showError = false; + + if (fee > $scope.minFeeAllowed && fee < $scope.minFeeRecommended) $scope.showMinWarning = true; + else $scope.showMinWarning = false; + + if (fee < $scope.maxFeeAllowed && fee > $scope.maxFeeRecommended) $scope.showMaxWarning = true; + else $scope.showMaxWarning = false; + }; + + $scope.updateFeeRate = function() { + var value = lodash.find($scope.feeLevels[$scope.network], { + level: $scope.feeLevel + }); + + // If no custom fee + if (value) { + $scope.customFeePerKB = null; + $scope.feePerSatByte = (value.feePerKB / 1000).toFixed(); + $scope.avgConfirmationTime = value.nbBlocks * 10; + } else { + $scope.avgConfirmationTime = null; + $scope.customSatPerByte = { value: Number($scope.feePerSatByte) }; + $scope.customFeePerKB = ($scope.feePerSatByte * 1000).toFixed(); + } + + // Warnings + $scope.setFeesRecommended(); + $scope.checkFees($scope.feePerSatByte); + + $timeout(function() { + $scope.$apply(); + }); + }; + + $scope.$watch( + "selectedFee.value", + function ( newValue, oldValue ) { + if (newValue != oldValue) { + $log.debug('New fee level: ' + newValue); + $scope.feeLevel = $scope.selectedFee.value; + $scope.updateFeeRate(); + } + } + ); + + // From parent controller + // $scope.network + // $scope.feeLevel + // + // IF usingCustomFee + // $scope.customFeePerKB + // $scope.feePerSatByte + + if (lodash.isEmpty($scope.feeLevel)) showErrorAndClose(null, gettextCatalog.getString('Fee level is not defined') ); + $scope.selectedFee = { value: $scope.feeLevel }; + + $scope.feeOpts = feeService.feeOpts; + $scope.loadingFee = true; + feeService.getFeeLevels(function(err, levels) { + $scope.loadingFee = false; + if (err || lodash.isEmpty(levels)) { + showErrorAndClose(null, err); + return; + } + if (lodash.isEmpty(levels)) { + showErrorAndClose(null, gettextCatalog.getString('Could not get fee levels')); + return; + } + $scope.feeLevels = levels; + $scope.updateFeeRate(); + }); + +}); diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index 3c3c6ce78..9339b413e 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -2,14 +2,14 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', function($scope, $timeout, $ionicHistory, lodash, gettextCatalog, configService, feeService, ongoingProcess, popupService) { - var network; - $scope.save = function(newFee) { - $scope.currentFeeLevel = newFee; - updateCurrentValues(); - if ($scope.noSave) - return; + $scope.currentFeeLevel = newFee; + + if ($scope.currentFeeLevel != 'custom') updateCurrentValues(); + else showCustomFeePrompt(); + + if ($scope.noSave) return; var opts = { wallet: { @@ -32,7 +32,6 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu }); $scope.init = function() { - $scope.network = $scope.network || 'livenet'; $scope.feeOpts = feeService.feeOpts; $scope.currentFeeLevel = $scope.feeLevel || feeService.getCurrentFeeLevel(); @@ -60,16 +59,60 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu }); if (lodash.isEmpty(value)) { - $scope.feePerSatByte = null; + $scope.feePerSatByte = $scope.currentFeeLevel == 'custom' ? $scope.feePerSatByte : null; $scope.avgConfirmationTime = null; + setMinWarning(); + setMaxWarning(); return; } $scope.feePerSatByte = (value.feePerKB / 1000).toFixed(); $scope.avgConfirmationTime = value.nbBlocks * 10; + $scope.invalidCustomFeeEntered = false; + setMinWarning(); + setMaxWarning(); }; $scope.chooseNewFee = function() { - $scope.hideModal($scope.currentFeeLevel); + $scope.hideModal($scope.currentFeeLevel, $scope.customFeePerKB); }; + + var showCustomFeePrompt = function() { + $scope.invalidCustomFeeEntered = true; + $scope.showMaxWarning = false; + $scope.showMinWarning = false; + popupService.showPrompt(gettextCatalog.getString('Custom Fee'), gettextCatalog.getString('Set your own fee in satoshis/byte'), null, function(text) { + if (!text || !parseInt(text) || parseInt(text) <= 0) return; + $scope.feePerSatByte = parseInt(text); + $scope.customFeePerKB = ($scope.feePerSatByte * 1000).toFixed(); + setMaxWarning(); + setMinWarning(); + $timeout(function() { + $scope.$apply(); + }); + }); + }; + + $scope.getMinimumRecommeded = function() { + var value = lodash.find($scope.feeLevels[$scope.network], { + level: 'superEconomy' + }); + return parseInt((value.feePerKB / 1000).toFixed()); + }; + + var setMinWarning = function() { + if (parseInt($scope.feePerSatByte) < $scope.getMinimumRecommeded()) $scope.showMinWarning = true; + else $scope.showMinWarning = false; + }; + + var setMaxWarning = function() { + if (parseInt($scope.feePerSatByte) > 1000) { + $scope.showMaxWarning = true; + $scope.invalidCustomFeeEntered = true; + } else { + $scope.showMaxWarning = false; + $scope.invalidCustomFeeEntered = false; + } + }; + }); diff --git a/src/js/controllers/preferencesLogs.js b/src/js/controllers/preferencesLogs.js index 7d356e615..5ee106bf0 100644 --- a/src/js/controllers/preferencesLogs.js +++ b/src/js/controllers/preferencesLogs.js @@ -1,39 +1,73 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesLogs', - function($scope, historicLog, platformInfo) { + function($scope, historicLog, lodash, configService, gettextCatalog) { + + var config = configService.getSync(); + var logLevels = historicLog.getLevels(); + var selectedLevel; + + $scope.logOptions = lodash.indexBy(logLevels, 'level'); + + var filterLogs = function(weight) { + $scope.filteredLogs = historicLog.get(weight); + }; + + $scope.setOptionSelected = function(level) { + var weight = $scope.logOptions[level].weight; + $scope.fillClass = 'fill-bar-' + level; + filterLogs(weight); + lodash.each($scope.logOptions, function(opt) { + opt.selected = opt.weight <= weight ? true : false; + opt.head = opt.weight == weight; + }); + + // Save the setting. + var opts = { + log: { + filter: level + } + }; + configService.set(opts, function(err) { + if (err) $log.debug(err); + }); + }; + + $scope.prepareLogs = function() { + var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n'; + log += '\n\n'; + log += historicLog.get().map(function(v) { + return '[' + v.timestamp + '][' + v.level + ']' + v.msg; + }).join('\n'); + + return log; + }; + + $scope.sendLogs = function() { + var body = $scope.prepareLogs(); + + window.plugins.socialsharing.shareViaEmail( + body, + 'Copay Logs', + null, // TO: must be null or an array + null, // CC: must be null or an array + null, // BCC: must be null or an array + null, // FILES: can be null, a string, or an array + function() {}, + function() {} + ); + }; + + $scope.showOptionsMenu = function() { + $scope.showOptions = true; + }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.isCordova = platformInfo.isCordova; + selectedLevel = lodash.has(config, 'log.filter') ? historicLog.getLevel(config.log.filter) : historicLog.getDefaultLevel(); + $scope.setOptionSelected(selectedLevel.level); }); $scope.$on("$ionicView.enter", function(event, data) { - $scope.logs = historicLog.get(); - - $scope.prepare = function() { - var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n'; - log += '\n\n'; - log += $scope.logs.map(function(v) { - return v.msg; - }).join('\n'); - - return log; - }; - - $scope.sendLogs = function() { - var body = $scope.prepare(); - - window.plugins.socialsharing.shareViaEmail( - body, - 'Copay Logs', - null, // TO: must be null or an array - null, // CC: must be null or an array - null, // BCC: must be null or an array - null, // FILES: can be null, a string, or an array - function() {}, - function() {} - ); - }; - + filterLogs(selectedLevel.weight); }); }); diff --git a/src/js/controllers/preferencesNotifications.js b/src/js/controllers/preferencesNotifications.js index 28371e319..3d78e98db 100644 --- a/src/js/controllers/preferencesNotifications.js +++ b/src/js/controllers/preferencesNotifications.js @@ -12,6 +12,11 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr value: config.pushNotificationsEnabled }; + var isConfirmedTxsNotificationsEnabled = config.confirmedTxsNotifications ? config.confirmedTxsNotifications.enabled : false; + $scope.confirmedTxsNotifications = { + value: isConfirmedTxsNotificationsEnabled + }; + $scope.latestEmail = { value: emailService.getEmailIfEnabled() }; @@ -42,6 +47,18 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr }); }; + $scope.confirmedTxsNotificationsChange = function() { + if (!$scope.pushNotifications) return; + var opts = { + confirmedTxsNotifications: { + enabled: $scope.confirmedTxsNotifications.value + } + }; + configService.set(opts, function(err) { + if (err) $log.debug(err); + }); + }; + $scope.emailNotificationsChange = function() { var opts = { enabled: $scope.emailNotifications.value, diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js index 175d7e016..3c66830b1 100644 --- a/src/js/controllers/topup.js +++ b/src/js/controllers/topup.js @@ -11,6 +11,11 @@ angular.module('copayApp.controllers').controller('topUpController', function($s var message; var configWallet = configService.getSync().wallet; + var _resetValues = function() { + $scope.totalAmountStr = $scope.amount = $scope.invoiceFee = $scope.networkFee = $scope.totalAmount = $scope.wallet = null; + createdTx = message = null; + }; + var showErrorAndBack = function(title, msg) { title = title || gettextCatalog.getString('Error'); $scope.sendStatus = ''; @@ -112,7 +117,7 @@ angular.module('copayApp.controllers').controller('topUpController', function($s var outputs = []; var toAddress = invoice.bitcoinAddress; - var amountSat = parseInt(invoice.btcDue * 100000000); // BTC to Satoshi + var amountSat = parseInt((invoice.btcDue * 100000000).toFixed(0)); // BTC to Satoshi outputs.push({ 'toAddress': toAddress, @@ -193,6 +198,8 @@ angular.module('copayApp.controllers').controller('topUpController', function($s return; } + // Sometimes API does not return this element; + invoice['buyerPaidBtcMinerFee'] = invoice.buyerPaidBtcMinerFee || 0; var invoiceFeeSat = (invoice.buyerPaidBtcMinerFee * 100000000).toFixed(); message = gettextCatalog.getString("Top up {{amountStr}} to debit card ({{cardLastNumber}})", { @@ -203,7 +210,8 @@ angular.module('copayApp.controllers').controller('topUpController', function($s createTx(wallet, invoice, message, function(err, ctxp) { ongoingProcess.set('loadingTxInfo', false); if (err) { - showErrorAndBack(err.title, err.message); + _resetValues(); + showError(err.title, err.message); return; } @@ -284,8 +292,8 @@ angular.module('copayApp.controllers').controller('topUpController', function($s ongoingProcess.set('topup', true, statusChangeHandler); publishAndSign($scope.wallet, createdTx, function() {}, function(err, txSent) { if (err) { - ongoingProcess.set('topup', false); - $scope.sendStatus = ''; + _resetValues(); + ongoingProcess.set('topup', false, statusChangeHandler); showError(gettextCatalog.getString('Could not send transaction'), err); return; } @@ -295,7 +303,7 @@ angular.module('copayApp.controllers').controller('topUpController', function($s }; $scope.showWalletSelector = function() { - $scope.walletSelectorTitle = 'From'; + $scope.walletSelectorTitle = gettextCatalog.getString('From'); $scope.showWallets = true; }; @@ -305,7 +313,7 @@ angular.module('copayApp.controllers').controller('topUpController', function($s calculateAmount(wallet, function(err, a, c) { ongoingProcess.set('retrievingInputs', false); if (err) { - createdTx = message = $scope.totalAmountStr = $scope.amountUnitStr = $scope.wallet = null; + _resetValues(); showError(err.title, err.message, function() { $scope.showWalletSelector(); }); diff --git a/src/js/controllers/tx-details.js b/src/js/controllers/tx-details.js index a7da4c9ca..66f43406a 100644 --- a/src/js/controllers/tx-details.js +++ b/src/js/controllers/tx-details.js @@ -1,9 +1,10 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $log, $ionicHistory, $scope, $timeout, walletService, lodash, gettextCatalog, profileService, externalLinkService, popupService, ongoingProcess, txFormatService, txConfirmNotification, feeService) { +angular.module('copayApp.controllers').controller('txDetailsController', function($rootScope, $log, $ionicHistory, $scope, $timeout, walletService, lodash, gettextCatalog, profileService, externalLinkService, popupService, ongoingProcess, txFormatService, txConfirmNotification, feeService, configService) { var txId; var listeners = []; + var config = configService.getSync(); $scope.$on("$ionicView.beforeEnter", function(event, data) { txId = data.stateParams.txid; @@ -12,6 +13,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.color = $scope.wallet.color; $scope.copayerId = $scope.wallet.credentials.copayerId; $scope.isShared = $scope.wallet.credentials.n > 1; + $scope.txsUnsubscribedForNotifications = config.confirmedTxsNotifications ? !config.confirmedTxsNotifications.enabled : true; txConfirmNotification.checkIfEnabled(txId, function(res) { $scope.txNotification = { diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index a41c32c2c..13698f0cd 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, feeService) { +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, appConfigService) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -52,9 +52,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun var analyzeUtxos = function() { if (analyzeUtxosDone) return; - feeService.getFeeLevels(function(err, levels){ + feeService.getFeeLevels(function(err, levels) { if (err) return; - walletService.getLowUtxos($scope.wallet, levels, function(err, resp){ + walletService.getLowUtxos($scope.wallet, levels, function(err, resp) { if (err || !resp) return; analyzeUtxosDone = true; $scope.lowUtxosWarning = resp.warning; @@ -171,7 +171,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }; - feeService.getFeeLevels(function(err, levels){ + feeService.getFeeLevels(function(err, levels) { walletService.getTxHistory($scope.wallet, { progressFn: progressFn, feeLevels: levels, @@ -378,9 +378,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun refreshAmountSection(); }); - $scope.$on("$ionicView.beforeLeave", function(event, data) { + $scope.$on("$ionicView.afterLeave", function(event, data) { + if ($window.StatusBar) { - $window.StatusBar.backgroundColorByHexString('#1e3186'); + var statusBarColor = appConfigService.name == 'copay' ? '#192c3a' : '#1e3186'; + $window.StatusBar.backgroundColorByHexString(statusBarColor); } }); @@ -392,7 +394,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun function setAndroidStatusBarColor() { var SUBTRACT_AMOUNT = 15; - var rgb = hexToRgb($scope.wallet.color); + var walletColor; + if (!$scope.wallet.color) walletColor = appConfigService.name == 'copay' ? '#019477' : '#4a90e2'; + else walletColor = $scope.wallet.color; + var rgb = hexToRgb(walletColor); var keys = Object.keys(rgb); keys.forEach(function(k) { if (rgb[k] - SUBTRACT_AMOUNT < 0) { diff --git a/src/js/directives/logOptions.js b/src/js/directives/logOptions.js new file mode 100644 index 000000000..6b00cdc0c --- /dev/null +++ b/src/js/directives/logOptions.js @@ -0,0 +1,29 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('logOptions', function($timeout, platformInfo) { + return { + restrict: 'E', + templateUrl: 'views/includes/logOptions.html', + transclude: true, + scope: { + show: '=logOptionsShow', + options: '=logOptions', + fillClass: '=logOptionsFillClass', + onSelect: '=logOptionsOnSelect', + onCopy: '=logOptionsOnCopy', + onSend: '=logOptionsOnSend' + }, + link: function(scope, element, attrs) { + scope.isCordova = platformInfo.isCordova; + + scope.hide = function() { + scope.show = false; + }; + + scope.getFillClass = function(index) { + scope.onSelect(index); + }; + } + }; + }); diff --git a/src/js/routes.js b/src/js/routes.js index 21b9515f9..87faa6266 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -44,7 +44,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr function($delegate, platformInfo) { var historicLog = historicLogProvider.$get(); - ['debug', 'info', 'warn', 'error', 'log'].forEach(function(level) { + historicLog.getLevels().forEach(function(levelDesc) { + var level = levelDesc.level; if (platformInfo.isDevel && level == 'error') return; var orig = $delegate[level]; @@ -1083,7 +1084,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }, params: { - cardClaimCode: null + invoiceId: null } }) .state('tabs.giftcards.amazon.amount', { diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js index ec70c7a00..682135e1b 100644 --- a/src/js/services/amazonService.js +++ b/src/js/services/amazonService.js @@ -3,6 +3,8 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo var root = {}; var credentials = {}; + root.limitPerDay = 1000; + /* * Development: 'testnet' * Production: 'livenet' diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 114074a28..ea0965b2a 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -9,36 +9,155 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log, return error; }; - var _processTransactions = function(invoices, history) { - invoices = invoices ||  []; - for (var i = 0; i < invoices.length; i++) { - var matched = false; - for (var j = 0; j < history.length; j++) { - if (history[j].description[0] && history[j].description[0].indexOf(invoices[i].id) > -1) { - matched = true; - } + var _buildDate = function(date, time) { + date = date.match(/(\d{2})\/(\d{2})\/(\d{4})/); + time = time.match(/(\d{2})(\d{2})(\d{2})/); + var newDate = new Date(date[1] + '/' + date[2] + '/' + date[3]); + newDate.setHours(time[1], time[2], time[3]); + return newDate; + }; + + var _lowercaseMerchant = function(merchant) { + if (merchant.name && merchant.name.toLowerCase) { + merchant.name = merchant.name.toLowerCase(); + } + if (merchant.city && merchant.city.toLowerCase) { + merchant.city = merchant.city.toLowerCase(); + } + + return merchant; + }; + + var _getMerchantInfo = function(tx) { + var bpTranCodes = root.bpTranCodes; + lodash.keys(bpTranCodes).forEach(function(code) { + if (tx.type.indexOf(code) === 0) { + lodash.assign(tx, bpTranCodes[code]); } - var isInvoiceLessThanOneDayOld = moment() < moment(new Date(invoices[i].invoiceTime)).add(1, 'day'); - if (!matched && isInvoiceLessThanOneDayOld) { - var isInvoiceUnderpaid = invoices[i].exceptionStatus === 'paidPartial'; + }); + return tx; + }; - if (['paid', 'confirmed', 'complete'].indexOf(invoices[i].status) >= 0 || - (invoices[i].status === 'invalid' || isInvoiceUnderpaid)) { + var _getIconName = function(tx) { + var icon = tx.mcc || tx.category || null; + if (!icon || root.iconMap[icon] == undefined) return 'default'; + return root.iconMap[icon]; + }; - history.unshift({ - timestamp: new Date(invoices[i].invoiceTime), - description: invoices[i].itemDesc, - amount: invoices[i].price, - type: '00611 = Client Funded Deposit', - pending: true, - status: invoices[i].status, - transactionId: invoices[i].transactions && invoices[i].transactions[0] ? invoices[i].transactions[0].txid : '', - exceptionStatus: invoices[i].exceptionStatus - }); + var _processDescription = function(tx) { + if (lodash.isArray(tx.description)) { + return tx.description[0]; + } + return tx.description; + }; + + var _processLocation = function(tx) { + if (tx.merchant.city && tx.merchant.state) { + return tx.merchant.city + ', ' + tx.merchant.state; + } else { + return tx.merchant.city || tx.merchant.state || ''; + } + }; + + var _fromTransaction = function(txn, runningBalance) { + var dateTime = _buildDate(txn.date, txn.time); + var merchant = _lowercaseMerchant(txn.merchant); + return _getMerchantInfo({ + date: txn.timestamp || dateTime, + category: txn.mcc, + merchant: merchant, + description: txn.description[0], + price: parseFloat(txn.amount) + parseFloat(txn.fee), + type: txn.type, + runningBalance: runningBalance + }); + }; + + var _processTransactions = function(invoices, history) { + + var balance = history.endingBalance || history.currentCardBalance; + var runningBalance = parseFloat(balance); + var activityList = []; + + if(history && history.transactionList){ + for (var j = 0; j < history.transactionList.length; j++) { + runningBalance -= parseFloat(history.transactionList[j].amount); + activityList.push(_fromTransaction(history.transactionList[j], runningBalance)); + } + } + + if (activityList.length > 0) { + + invoices = invoices ||  []; + for (var i = 0; i < invoices.length; i++) { + var matched = false; + for (var j = 0; j < history.transactionList.length; j++) { + var description = history.transactionList[j].description; + for (var k = 0; k < description.length; k++) { + if (description[k] && description[k].indexOf(invoices[i].id) > -1) { + matched = true; + } + } + } + + var isInvoiceLessThanOneDayOld = moment() < moment(new Date(invoices[i].invoiceTime)).add(1, 'day'); + + if (!matched && isInvoiceLessThanOneDayOld) { + var isInvoiceUnderpaid = invoices[i].exceptionStatus === 'paidPartial'; + + if (['paid', 'confirmed', 'complete'].indexOf(invoices[i].status) >= 0 || + (invoices[i].status === 'invalid' || isInvoiceUnderpaid)) { + + activityList.unshift(_getMerchantInfo({ + date: new Date(invoices[i].invoiceTime), + category: '', + merchant: '', + description: invoices[i].itemDesc, + price: invoices[i].price, + type: '00611 = Client Funded Deposit', + runningBalance: null, + pending: true, + transactionId: invoices[i].transactions && invoices[i].transactions[0] ? invoices[i].transactions[0].txid : '' + })); + } } } } - return history; + for (var i = 0; i < activityList.length; i++) { + activityList[i].icon = _getIconName(activityList[i]); + activityList[i].desc = _processDescription(activityList[i]); + activityList[i].merchant['location'] = _processLocation(activityList[i]); + } + return activityList; + }; + + root.filterTransactions = function(type, txns) { + var list, + getPreAuth = lodash.filter(txns, function(txn) { + return txn.type.indexOf('93') > -1; + }), + getPending = lodash.filter(txns, function(txn) { + return txn.pending; + }), + getCompleted = lodash.filter(txns, function(txn) { + return !txn.pending && txn.type.indexOf('93') == -1; + }); + + switch (type) { + case "preAuth": + list = lodash.filter(getPreAuth); + break; + case "confirming": + list = lodash.filter(getPending); + break; + case "completed": + list = lodash.filter(getCompleted); + break; + default: + // code... + break; + } + return list; }; root.sync = function(apiContext, cb) { @@ -91,12 +210,11 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log, // opts: range root.getHistory = function(cardId, opts, cb) { - var invoices, transactions; + var invoices, history; opts = opts || {}; var json = { - method: 'getInvoiceHistory', - params: JSON.stringify(opts) + method: 'getInvoiceHistory' }; appIdentityService.getIdentity(bitpayService.getEnvironment().network, function(err, appIdentity) { @@ -123,17 +241,17 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log, method: 'getTransactionHistory', params: JSON.stringify(opts) }; - // Get transactions list + // Get transactions History list bitpayService.post('/api/v2/' + card.token, json, function(data) { - $log.info('BitPay Get Transactions: SUCCESS'); - transactions = data.data.data || {}; - transactions['txs'] = _processTransactions(invoices, transactions.transactionList); + $log.info('BitPay Get History: SUCCESS'); + history = data.data.data || {}; + history['txs'] = _processTransactions(invoices, history); - root.setLastKnownBalance(cardId, transactions.currentCardBalance, function() {}); + root.setLastKnownBalance(cardId, history.currentCardBalance, function() {}); - return cb(data.data.error, transactions); + return cb(data.data.error, history); }, function(data) { - return cb(_setError('BitPay Card Error: Get Transactions', data)); + return cb(_setError('BitPay Card Error: Get History', data)); }); }, function(data) { return cb(_setError('BitPay Card Error: Get Invoices', data)); @@ -338,7 +456,22 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log, category: 'bp002', description: '' }, - '9991': { // General assignment of a fee for WC card + 'load': { + merchant: { + name: 'BitPay', + city: 'Atlanta', + state: 'GA' + }, + category: 'bp001', + description: 'Top-Up' + }, + 'unload | pos': { + description: 'Purchase' + }, + 'unload | epos': { + description: 'Online Purchase' + }, + 'transactionfee': { merchant: { name: 'Transaction Fee', }, diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 5a2e1d1f7..8c9b2d867 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -88,9 +88,17 @@ angular.module('copayApp.services').factory('configService', function(storageSer pushNotificationsEnabled: true, + confirmedTxsNotifications: { + enabled: true, + }, + emailNotifications: { enabled: false, }, + + log: { + filter: 'debug', + }, }; var configCache = null; diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index cdab6a7a5..3a289bfd8 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -11,7 +11,8 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou priority: gettext('Priority'), normal: gettext('Normal'), economy: gettext('Economy'), - superEconomy: gettext('Super Economy') + superEconomy: gettext('Super Economy'), + custom: gettext('Custom') }; var cache = { @@ -24,6 +25,9 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou root.getFeeRate = function(network, feeLevel, cb) { + + if (feeLevel == 'custom') return cb(); + network = network || 'livenet'; root.getFeeLevels(function(err, levels, fromCache) { diff --git a/src/js/services/historicLog.js b/src/js/services/historicLog.js index f0cd8e5a5..88446ae54 100644 --- a/src/js/services/historicLog.js +++ b/src/js/services/historicLog.js @@ -1,18 +1,54 @@ 'use strict'; var logs = []; angular.module('copayApp.services') - .factory('historicLog', function historicLog() { + .factory('historicLog', function historicLog(lodash) { var root = {}; + var levels = [ + { level: 'error', weight: 0, label: 'Error'}, + { level: 'warn', weight: 1, label: 'Warning'}, + { level: 'info', weight: 2, label: 'Info', default: true}, + { level: 'debug', weight: 3, label: 'Debug'} + ]; + + // Create an array of level weights for performant filtering. + var weight = {}; + for (var i = 0; i < levels.length; i++) { + weight[levels[i].level] = levels[i].weight; + } + + root.getLevels = function() { + return levels; + }; + + root.getLevel = function(level) { + return lodash.find(levels, function(l) { + return l.level == level; + }); + }; + + root.getDefaultLevel = function() { + return lodash.find(levels, function(l) { + return l.default; + }); + }; + root.add = function(level, msg) { logs.push({ + timestamp: new Date().toISOString(), level: level, msg: msg, }); }; - root.get = function() { - return logs; + root.get = function(filterWeight) { + var filteredLogs = logs; + if (filterWeight != undefined) { + filteredLogs = lodash.filter(logs, function(l) { + return weight[l.level] <= filterWeight; + }); + } + return filteredLogs; }; return root; diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js index 566171949..8b4489947 100644 --- a/src/js/services/popupService.js +++ b/src/js/services/popupService.js @@ -72,7 +72,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni var okText = gettextCatalog.getString('OK'); var cancelText = gettextCatalog.getString('Cancel'); title = title ? title : ''; - navigator.notification.prompt(message, onPrompt, title, [cancelText, okText], opts.defaultText); + navigator.notification.prompt(message, onPrompt, title, [okText, cancelText], opts.defaultText); }; /** diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index ae44c7b26..d5598a5b8 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -134,7 +134,7 @@ angular.module('copayApp.services') wallet.setNotificationsInterval(UPDATE_PERIOD); wallet.openWallet(function(err) { if (wallet.status !== true) - $log.log('Wallet + ' + walletId + ' status:' + wallet.status) + $log.debug('Wallet + ' + walletId + ' status:' + wallet.status) }); }); diff --git a/src/sass/directives/directives.scss b/src/sass/directives/directives.scss index 79e3edbd3..9159d3f23 100644 --- a/src/sass/directives/directives.scss +++ b/src/sass/directives/directives.scss @@ -1 +1 @@ -@import "gravatar" +@import "gravatar"; diff --git a/src/sass/variables.scss b/src/sass/variables.scss index e3ccc4951..ccc67e96e 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -43,8 +43,8 @@ $v-wallet-color-map: ( 13: (color: #7a8c9e, name: 'Light Slate Grey') ) !default; -/* Theme */ -$v-default-wallet-color-index: 6 !default; // See $v-wallet-color-map +/* Theme */ +$v-default-wallet-color-index: 8 !default; // See $v-wallet-color-map $v-subtle-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25) !default; $v-hovering-box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3) !default; $v-subtle-radius: 3px !default; diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index c05bd8497..79bed16a6 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -88,14 +88,18 @@ margin: 0; border: 0; - &.send .svg #-Transaction-icons { + &.send svg .nc-icon-wrapper g, + &.send svg .nc-icon-wrapper path, + &.send .tx-icon .houston { } - &.receive .svg #-Transaction-icons, + &.receive svg .nc-icon-wrapper g, + &.receive svg .nc-icon-wrapper path, &.receive .tx-icon .houston { stroke: #09C286; color: #09C286; } - &.pending .svg #-Transaction-icons, + &.pending svg .nc-icon-wrapper g, + &.pending svg .nc-icon-wrapper path, &.pending .tx-icon .houston { stroke: $v-bitcoin-orange; color: $v-bitcoin-orange; @@ -154,11 +158,13 @@ } .tx-message { margin-right: 1rem; + text-transform: capitalize; } .tx-location { margin-right: 1rem; font-size: 12.5px; color: $v-light-gray; + text-transform: capitalize; } .tx-amount { font-size: 16px; diff --git a/src/sass/views/includes/checkBar.scss b/src/sass/views/includes/checkBar.scss new file mode 100644 index 000000000..337635505 --- /dev/null +++ b/src/sass/views/includes/checkBar.scss @@ -0,0 +1,62 @@ +#check-bar { + $bar-widths: ( + // defined by user, example: + // error: 10%, + // warn: 37%, + // info: 65%, + // debug: 90% + ); + .item { + padding: 40px; + } + .checkbox-icon { + width: 22px; + height: 22px; + } + .checkbox-icon:after { + border: none; + } + .check-bar { + position: relative; + .initial-bar-default { + border: 2px solid $v-success-color; + width: 0%; + top: 40px; + z-index: 99; + border-radius: 10px; + position: absolute; + } + .initial-bar { + } + @each $name, $bar-width in $bar-widths { + .fill-bar-#{$name} { + width: $bar-width !important; + transition: width .2s; + } + } + .base-bar { + position: absolute; + width: 100%; + border-bottom: 2px solid #f2f2f2; + top: 41px; + z-index: 98; + left: 0px; + } + &.list { + margin-top: 20px; + display: flex; + justify-content: space-between; + .custom-checkbox { + text-align: -webkit-center; + .item { + border-style: none; + z-index: 999; + background-color: inherit; + } + label { + padding-top: 5px; + } + } + } + } +} diff --git a/src/sass/views/includes/logOptions.scss b/src/sass/views/includes/logOptions.scss new file mode 100644 index 000000000..89dfef121 --- /dev/null +++ b/src/sass/views/includes/logOptions.scss @@ -0,0 +1,88 @@ +log-options { + + $border-color: #EFEFEF; + + .bp-action-sheet__sheet { + padding-left: 2rem; + padding-right: .75rem; + } + + .entry { + border: 0; + padding-right: 0; + padding-top: 0; + padding-bottom: 0; + margin-bottom: 1px; + overflow: visible; + + > i { + color: $v-accent-color; + padding: 0 0 5px 0; + margin-left: -5px; + + > img { + height: 39px; + width: 39px; + padding: 4px; + } + } + } + + .entry-inner { + display: flex; + position: relative; + padding-top: 16px; + padding-bottom: 16px; + + &::after { + display: block; + position: absolute; + width: 100%; + height: 1px; + background: $border-color; + bottom: 0; + right: 0; + content: ''; + } + } + + .entry-details { + flex-grow: 1; + + .entry-name { + padding-bottom: 5px; + } + } + + #check-bar { + $bar-widths: ( + // Order must match weight, see services/historicLog.js + error: 10%, + warn: 35%, + info: 65%, + debug: 90% + ); + .check-bar { + .initial-bar { + border: 2px solid $v-accent-color; + } + @each $name, $bar-width in $bar-widths { + .fill-bar-#{$name} { + width: $bar-width !important; + } + } + } + + .head .checkbox-icon { + width: 22px; + height: 22px; + top: 0; + } + + .checkbox-icon { + width: 10px; + height: 10px; + top: 6px; + } + } +} diff --git a/src/sass/views/includes/modals/choose-fee-level.scss b/src/sass/views/includes/modals/choose-fee-level.scss new file mode 100644 index 000000000..920502698 --- /dev/null +++ b/src/sass/views/includes/modals/choose-fee-level.scss @@ -0,0 +1,57 @@ +#choose-fee-level { + @extend .deflash-blue; + .selected-fee-level { + text-align: center; + background: #f9f9f9; + font-size: 11px; + height: 140px; + padding-top: 25px; + .row { + padding: 0; + } + .col { + padding-top: 15px; + } + .separator { + border-left: 1px solid #d9d9df; + height: 75%; + } + .value { + font-size: 20px; + margin-bottom: 10px; + } + .rate .list { + margin-bottom: 0; + } + + .item-input { + input[type="number"] { + text-align: right; + padding-right: 90px; + } + .unit { + color: #9c9c9c; + background: #f2f2f2; + position: absolute; + right: 0; + top: 0; + padding: 15px 10px 12px 10px; + } + } + } + .error-fee { + padding: 8px 10px; + color: $v-error-color; + font-size: 12px; + text-align: center; + i { + margin-right: 8px; + } + } + .box-notification { + margin: 0; + padding: 1px; + text-align: center; + } + +} diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index 2cf1d9efa..6e17b4d37 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -25,6 +25,15 @@ background-color: #fff; font-size:0.9em; color: $v-mid-gray; + .text { + padding-left: 25px; + } + .icon { + position: absolute; + img { + width: 20px; + } + } } &-explanation, &-button-group { padding: 0 1rem; @@ -91,6 +100,10 @@ .item-button-right > .button { top: 16px; } + .toggle-small.item-toggle .toggle, + .item-button-right > .button { + top: 25px; + } .item-button-right > .button { font-size: 16px; } @@ -110,6 +123,20 @@ color: #00901B; } } + .log-bg { + background: white; + } + .log-entry { + font-size: 12px; + line-height: 18px; + border: none; + } + .log-timestamp { + font-weight: bold; + } + .log-level { + font-weight: bold; + } } #tab-settings { @@ -162,6 +189,7 @@ #settings-fee { .estimates { + min-height: 6rem; font-size: 15px; color: $v-dark-gray; margin-bottom: .5rem; diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 7a8058339..722c97e1d 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -34,6 +34,7 @@ @import "includes/walletActivity"; @import "includes/wallets"; @import "includes/modals/modals"; +@import "includes/modals/choose-fee-level"; @import "includes/clickToAccept"; @import "includes/incomingDataMenu"; @import "includes/slideToAccept"; @@ -47,3 +48,5 @@ @import "integrations/integrations"; @import "custom-amount"; @import "includes/pin"; +@import "includes/logOptions"; +@import "includes/checkBar"; diff --git a/www/img/mcc-icons/airplane.svg b/www/img/mcc-icons/airplane.svg index ed1ee3a70..40e8c6869 100644 --- a/www/img/mcc-icons/airplane.svg +++ b/www/img/mcc-icons/airplane.svg @@ -1,14 +1 @@ - - - - airplane - Created with Sketch. - - - - - - - - - \ No newline at end of file +airplane \ No newline at end of file diff --git a/www/img/mcc-icons/art.svg b/www/img/mcc-icons/art.svg index 4437f7a61..4e792a044 100644 --- a/www/img/mcc-icons/art.svg +++ b/www/img/mcc-icons/art.svg @@ -1,20 +1 @@ - - - - art - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +art \ No newline at end of file diff --git a/www/img/mcc-icons/bicycle.svg b/www/img/mcc-icons/bicycle.svg index 26e8a9431..03a7dc57c 100644 --- a/www/img/mcc-icons/bicycle.svg +++ b/www/img/mcc-icons/bicycle.svg @@ -1,21 +1 @@ - - - - bicycle - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +bicycle \ No newline at end of file diff --git a/www/img/mcc-icons/bitcoin-topup.svg b/www/img/mcc-icons/bitcoin-topup.svg index 024dcd512..8fbb8d0ef 100644 --- a/www/img/mcc-icons/bitcoin-topup.svg +++ b/www/img/mcc-icons/bitcoin-topup.svg @@ -1,31 +1 @@ - - - - bitcoin-topup - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +bitcoin-topup \ No newline at end of file diff --git a/www/img/mcc-icons/boat.svg b/www/img/mcc-icons/boat.svg index 5fc321e47..cb6d2d311 100644 --- a/www/img/mcc-icons/boat.svg +++ b/www/img/mcc-icons/boat.svg @@ -1,17 +1 @@ - - - - boat - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file +boat \ No newline at end of file diff --git a/www/img/mcc-icons/books.svg b/www/img/mcc-icons/books.svg index 217c5642b..9b73de1e9 100644 --- a/www/img/mcc-icons/books.svg +++ b/www/img/mcc-icons/books.svg @@ -1,27 +1 @@ - - - - books - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +books \ No newline at end of file diff --git a/www/img/mcc-icons/bowling.svg b/www/img/mcc-icons/bowling.svg index 6d8f171fa..fefab8446 100644 --- a/www/img/mcc-icons/bowling.svg +++ b/www/img/mcc-icons/bowling.svg @@ -1,19 +1 @@ - - - - bowling - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file +bowling \ No newline at end of file diff --git a/www/img/mcc-icons/bug.svg b/www/img/mcc-icons/bug.svg index e1aed95c2..22883da3f 100644 --- a/www/img/mcc-icons/bug.svg +++ b/www/img/mcc-icons/bug.svg @@ -1,21 +1 @@ - - - - bug - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +bug \ No newline at end of file diff --git a/www/img/mcc-icons/bus.svg b/www/img/mcc-icons/bus.svg index fa69bd7a9..a6de44595 100644 --- a/www/img/mcc-icons/bus.svg +++ b/www/img/mcc-icons/bus.svg @@ -1,21 +1 @@ - - - - bus - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +bus \ No newline at end of file diff --git a/www/img/mcc-icons/camera.svg b/www/img/mcc-icons/camera.svg index 5c518bbfc..5c6710244 100644 --- a/www/img/mcc-icons/camera.svg +++ b/www/img/mcc-icons/camera.svg @@ -1,14 +1 @@ - - - - camera - Created with Sketch. - - - - - - - - - \ No newline at end of file +camera \ No newline at end of file diff --git a/www/img/mcc-icons/car.svg b/www/img/mcc-icons/car.svg index df7094476..6e8f1e4e4 100644 --- a/www/img/mcc-icons/car.svg +++ b/www/img/mcc-icons/car.svg @@ -1,14 +1 @@ - - - - car - Created with Sketch. - - - - - - - - - \ No newline at end of file +car \ No newline at end of file diff --git a/www/img/mcc-icons/clean.svg b/www/img/mcc-icons/clean.svg index 2bf263eb4..2a62d97c0 100644 --- a/www/img/mcc-icons/clean.svg +++ b/www/img/mcc-icons/clean.svg @@ -1,21 +1 @@ - - - - clean - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +clean \ No newline at end of file diff --git a/www/img/mcc-icons/clock.svg b/www/img/mcc-icons/clock.svg index abfae8e81..6bd3e7e08 100644 --- a/www/img/mcc-icons/clock.svg +++ b/www/img/mcc-icons/clock.svg @@ -1,16 +1 @@ - - - - clock - Created with Sketch. - - - - - - clock - - - - - \ No newline at end of file +clock \ No newline at end of file diff --git a/www/img/mcc-icons/cocktail.svg b/www/img/mcc-icons/cocktail.svg index ac72141c8..f03d4ba99 100644 --- a/www/img/mcc-icons/cocktail.svg +++ b/www/img/mcc-icons/cocktail.svg @@ -1,14 +1 @@ - - - - cocktail - Created with Sketch. - - - - - - - - - \ No newline at end of file +cocktail \ No newline at end of file diff --git a/www/img/mcc-icons/coins.svg b/www/img/mcc-icons/coins.svg index 8753a2cd8..d026b7605 100644 --- a/www/img/mcc-icons/coins.svg +++ b/www/img/mcc-icons/coins.svg @@ -1,27 +1 @@ - - - - coins - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +coins \ No newline at end of file diff --git a/www/img/mcc-icons/computer.svg b/www/img/mcc-icons/computer.svg index 442e7f36a..92d5e187f 100644 --- a/www/img/mcc-icons/computer.svg +++ b/www/img/mcc-icons/computer.svg @@ -1,21 +1 @@ - - - - computer - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +computer \ No newline at end of file diff --git a/www/img/mcc-icons/default.svg b/www/img/mcc-icons/default.svg index 1458e3115..46320a4fd 100644 --- a/www/img/mcc-icons/default.svg +++ b/www/img/mcc-icons/default.svg @@ -1,20 +1 @@ - - - - default - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +default \ No newline at end of file diff --git a/www/img/mcc-icons/diamond-ring.svg b/www/img/mcc-icons/diamond-ring.svg index c8acf7c60..515eae49c 100644 --- a/www/img/mcc-icons/diamond-ring.svg +++ b/www/img/mcc-icons/diamond-ring.svg @@ -1,21 +1 @@ - - - - diamond-ring - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +diamond-ring \ No newline at end of file diff --git a/www/img/mcc-icons/dollar-topup.svg b/www/img/mcc-icons/dollar-topup.svg index 2dd9cf755..e36779ed1 100644 --- a/www/img/mcc-icons/dollar-topup.svg +++ b/www/img/mcc-icons/dollar-topup.svg @@ -1,21 +1 @@ - - - - dollar-topup - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +dollar-topup \ No newline at end of file diff --git a/www/img/mcc-icons/euro-topup.svg b/www/img/mcc-icons/euro-topup.svg index 07d7f65bf..027c8a836 100644 --- a/www/img/mcc-icons/euro-topup.svg +++ b/www/img/mcc-icons/euro-topup.svg @@ -1,24 +1 @@ - - - - euro-topup - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file +euro-topup \ No newline at end of file diff --git a/www/img/mcc-icons/film.svg b/www/img/mcc-icons/film.svg index 71595e207..d9788f690 100644 --- a/www/img/mcc-icons/film.svg +++ b/www/img/mcc-icons/film.svg @@ -1,27 +1 @@ - - - - film - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +film \ No newline at end of file diff --git a/www/img/mcc-icons/food.svg b/www/img/mcc-icons/food.svg index b75ddfa89..3044b6765 100644 --- a/www/img/mcc-icons/food.svg +++ b/www/img/mcc-icons/food.svg @@ -1,23 +1 @@ - - - - food - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file +food \ No newline at end of file diff --git a/www/img/mcc-icons/football.svg b/www/img/mcc-icons/football.svg index 98cdc5733..159a93882 100644 --- a/www/img/mcc-icons/football.svg +++ b/www/img/mcc-icons/football.svg @@ -1,18 +1 @@ - - - - football - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file +football \ No newline at end of file diff --git a/www/img/mcc-icons/furniture.svg b/www/img/mcc-icons/furniture.svg index 3db75a2e3..c590bc815 100644 --- a/www/img/mcc-icons/furniture.svg +++ b/www/img/mcc-icons/furniture.svg @@ -1,26 +1 @@ - - - - furniture - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +furniture \ No newline at end of file diff --git a/www/img/mcc-icons/game.svg b/www/img/mcc-icons/game.svg index b6571727a..9679e789a 100644 --- a/www/img/mcc-icons/game.svg +++ b/www/img/mcc-icons/game.svg @@ -1,21 +1 @@ - - - - game - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +game \ No newline at end of file diff --git a/www/img/mcc-icons/gas.svg b/www/img/mcc-icons/gas.svg index 2ca1b629c..38415ece3 100644 --- a/www/img/mcc-icons/gas.svg +++ b/www/img/mcc-icons/gas.svg @@ -1,14 +1 @@ - - - - gas - Created with Sketch. - - - - - - - - - \ No newline at end of file +gas \ No newline at end of file diff --git a/www/img/mcc-icons/golf.svg b/www/img/mcc-icons/golf.svg index c862db239..3ba939688 100644 --- a/www/img/mcc-icons/golf.svg +++ b/www/img/mcc-icons/golf.svg @@ -1,22 +1 @@ - - - - golf - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file +golf \ No newline at end of file diff --git a/www/img/mcc-icons/hotel.svg b/www/img/mcc-icons/hotel.svg index 21275241c..c0b1e4dc6 100644 --- a/www/img/mcc-icons/hotel.svg +++ b/www/img/mcc-icons/hotel.svg @@ -1,30 +1 @@ - - - - hotel - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +hotel \ No newline at end of file diff --git a/www/img/mcc-icons/law.svg b/www/img/mcc-icons/law.svg index 9621807e3..49dbc1ccf 100644 --- a/www/img/mcc-icons/law.svg +++ b/www/img/mcc-icons/law.svg @@ -1,21 +1 @@ - - - - law - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +law \ No newline at end of file diff --git a/www/img/mcc-icons/mail.svg b/www/img/mcc-icons/mail.svg index 7d4ddc4aa..b28775d97 100644 --- a/www/img/mcc-icons/mail.svg +++ b/www/img/mcc-icons/mail.svg @@ -1,14 +1 @@ - - - - mail - Created with Sketch. - - - - - - - - - \ No newline at end of file +mail \ No newline at end of file diff --git a/www/img/mcc-icons/medical.svg b/www/img/mcc-icons/medical.svg index ab9396a9c..d3d059e3d 100644 --- a/www/img/mcc-icons/medical.svg +++ b/www/img/mcc-icons/medical.svg @@ -1,20 +1 @@ - - - - medical - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +medical \ No newline at end of file diff --git a/www/img/mcc-icons/money.svg b/www/img/mcc-icons/money.svg index ab2f8cb62..d4700d3cf 100644 --- a/www/img/mcc-icons/money.svg +++ b/www/img/mcc-icons/money.svg @@ -1,19 +1 @@ - - - - money - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file +money \ No newline at end of file diff --git a/www/img/mcc-icons/motorcycle.svg b/www/img/mcc-icons/motorcycle.svg index de7c042fa..177c51ca9 100644 --- a/www/img/mcc-icons/motorcycle.svg +++ b/www/img/mcc-icons/motorcycle.svg @@ -1,17 +1 @@ - - - - motorcycle - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file +motorcycle \ No newline at end of file diff --git a/www/img/mcc-icons/music.svg b/www/img/mcc-icons/music.svg index 7d11f7e9e..aa1ab63e1 100644 --- a/www/img/mcc-icons/music.svg +++ b/www/img/mcc-icons/music.svg @@ -1,20 +1 @@ - - - - music - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +music \ No newline at end of file diff --git a/www/img/mcc-icons/newspaper.svg b/www/img/mcc-icons/newspaper.svg index e564969f0..8572e8223 100644 --- a/www/img/mcc-icons/newspaper.svg +++ b/www/img/mcc-icons/newspaper.svg @@ -1,14 +1 @@ - - - - newspaper - Created with Sketch. - - - - - - - - - \ No newline at end of file +newspaper \ No newline at end of file diff --git a/www/img/mcc-icons/park.svg b/www/img/mcc-icons/park.svg index 87c4348d6..233ed999e 100644 --- a/www/img/mcc-icons/park.svg +++ b/www/img/mcc-icons/park.svg @@ -1,19 +1 @@ - - - - park - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file +park \ No newline at end of file diff --git a/www/img/mcc-icons/people.svg b/www/img/mcc-icons/people.svg index 3126e0600..e4ac4429e 100644 --- a/www/img/mcc-icons/people.svg +++ b/www/img/mcc-icons/people.svg @@ -1,17 +1 @@ - - - - people - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file +people \ No newline at end of file diff --git a/www/img/mcc-icons/pet.svg b/www/img/mcc-icons/pet.svg index 220ae5a39..f63e7edbb 100644 --- a/www/img/mcc-icons/pet.svg +++ b/www/img/mcc-icons/pet.svg @@ -1,20 +1 @@ - - - - pet - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +pet \ No newline at end of file diff --git a/www/img/mcc-icons/plant.svg b/www/img/mcc-icons/plant.svg index a579234f2..d693aefc3 100644 --- a/www/img/mcc-icons/plant.svg +++ b/www/img/mcc-icons/plant.svg @@ -1,20 +1 @@ - - - - plant - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +plant \ No newline at end of file diff --git a/www/img/mcc-icons/purchase.svg b/www/img/mcc-icons/purchase.svg index 1f7c914e0..5d2b3fcb2 100644 --- a/www/img/mcc-icons/purchase.svg +++ b/www/img/mcc-icons/purchase.svg @@ -1,20 +1 @@ - - - - purchase - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +purchase \ No newline at end of file diff --git a/www/img/mcc-icons/repair.svg b/www/img/mcc-icons/repair.svg index 36a75b55c..bca6724d1 100644 --- a/www/img/mcc-icons/repair.svg +++ b/www/img/mcc-icons/repair.svg @@ -1,16 +1 @@ - - - - repair - Created with Sketch. - - - - - - - - - - - \ No newline at end of file +repair \ No newline at end of file diff --git a/www/img/mcc-icons/sadface.svg b/www/img/mcc-icons/sadface.svg index 963241c4a..422101d0c 100644 --- a/www/img/mcc-icons/sadface.svg +++ b/www/img/mcc-icons/sadface.svg @@ -1,20 +1 @@ - - - - sadface - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +sadface \ No newline at end of file diff --git a/www/img/mcc-icons/scissors.svg b/www/img/mcc-icons/scissors.svg index 519c03f53..cb41a20d6 100644 --- a/www/img/mcc-icons/scissors.svg +++ b/www/img/mcc-icons/scissors.svg @@ -1,19 +1 @@ - - - - scissors - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file +scissors \ No newline at end of file diff --git a/www/img/mcc-icons/search.svg b/www/img/mcc-icons/search.svg index d1ec0ddf5..1fd6c2659 100644 --- a/www/img/mcc-icons/search.svg +++ b/www/img/mcc-icons/search.svg @@ -1,17 +1 @@ - - - - search - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file +search \ No newline at end of file diff --git a/www/img/mcc-icons/shirt.svg b/www/img/mcc-icons/shirt.svg index 1f67a93fe..2537830d7 100644 --- a/www/img/mcc-icons/shirt.svg +++ b/www/img/mcc-icons/shirt.svg @@ -1,21 +1 @@ - - - - shirt - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +shirt \ No newline at end of file diff --git a/www/img/mcc-icons/shoes.svg b/www/img/mcc-icons/shoes.svg index e460c4919..17af5353a 100644 --- a/www/img/mcc-icons/shoes.svg +++ b/www/img/mcc-icons/shoes.svg @@ -1,18 +1 @@ - - - - shoes - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file +shoes \ No newline at end of file diff --git a/www/img/mcc-icons/smiley-face.svg b/www/img/mcc-icons/smiley-face.svg index 99967b26e..298e51164 100644 --- a/www/img/mcc-icons/smiley-face.svg +++ b/www/img/mcc-icons/smiley-face.svg @@ -1,19 +1 @@ - - - - smiley-face - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file +smiley-face \ No newline at end of file diff --git a/www/img/mcc-icons/suitcase.svg b/www/img/mcc-icons/suitcase.svg index f18da30ed..59cad03d1 100644 --- a/www/img/mcc-icons/suitcase.svg +++ b/www/img/mcc-icons/suitcase.svg @@ -1,25 +1 @@ - - - - business-48px-outline_briefcase-25 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +business-48px-outline_briefcase-25 \ No newline at end of file diff --git a/www/img/mcc-icons/telephone.svg b/www/img/mcc-icons/telephone.svg index 370bd087f..424f34fe7 100644 --- a/www/img/mcc-icons/telephone.svg +++ b/www/img/mcc-icons/telephone.svg @@ -1,14 +1 @@ - - - - telephone - Created with Sketch. - - - - - - - - - \ No newline at end of file +telephone \ No newline at end of file diff --git a/www/img/mcc-icons/television.svg b/www/img/mcc-icons/television.svg index c6fcb6c60..0a402da0c 100644 --- a/www/img/mcc-icons/television.svg +++ b/www/img/mcc-icons/television.svg @@ -1,21 +1 @@ - - - - television - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file +television \ No newline at end of file diff --git a/www/img/mcc-icons/tent.svg b/www/img/mcc-icons/tent.svg index 54cb9e1c7..5edf93d0b 100644 --- a/www/img/mcc-icons/tent.svg +++ b/www/img/mcc-icons/tent.svg @@ -1,20 +1 @@ - - - - tent - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +tent \ No newline at end of file diff --git a/www/img/mcc-icons/ticket.svg b/www/img/mcc-icons/ticket.svg index 6906c2577..a21490151 100644 --- a/www/img/mcc-icons/ticket.svg +++ b/www/img/mcc-icons/ticket.svg @@ -1,18 +1 @@ - - - - ticket - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file +ticket \ No newline at end of file diff --git a/www/img/mcc-icons/toy.svg b/www/img/mcc-icons/toy.svg index 42028cae1..0a48dc10a 100644 --- a/www/img/mcc-icons/toy.svg +++ b/www/img/mcc-icons/toy.svg @@ -1,23 +1 @@ - - - - toy - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file +toy \ No newline at end of file diff --git a/www/img/mcc-icons/truck.svg b/www/img/mcc-icons/truck.svg index bd597e9fc..4bd63b7e1 100644 --- a/www/img/mcc-icons/truck.svg +++ b/www/img/mcc-icons/truck.svg @@ -1,24 +1 @@ - - - - truck - Created with Sketch. - - - - - - - - - - - - - - - - - - - \ No newline at end of file +truck \ No newline at end of file diff --git a/www/img/mcc-icons/watch.svg b/www/img/mcc-icons/watch.svg index 3ac34787f..3ec73801f 100644 --- a/www/img/mcc-icons/watch.svg +++ b/www/img/mcc-icons/watch.svg @@ -1,20 +1 @@ - - - - watch - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file +watch \ No newline at end of file diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index 04440fa9e..6fbe3690e 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -2,7 +2,7 @@ - Buy + {{'Buy'|translate}} @@ -19,14 +19,14 @@
{{amountUnitStr}}
- Purchase Amount is limited to USD 1000 per day + {{limitPerDayMessage}}
-
From
+
From
@@ -35,6 +35,36 @@
+
+
+ Details +
+
+ Gift card + + {{amount | currency:'$ ':2}} {{currencyIsoCode}} + +
+
+ Invoice Fee + + {{invoiceFee | currency:'$ ':2}} {{currencyIsoCode}} + +
+
+ Network Fee + + {{networkFee | currency:'$ ':2}} {{currencyIsoCode}} + +
+
+ Total + + {{totalAmount | currency:'$ ':2}} {{currencyIsoCode}} + ({{totalAmountStr}}) + +
+
* Amazon.com is not a sponsor of this promotion. @@ -56,30 +86,29 @@ ng-click="buyConfirm()" ng-if="!isCordova" click-send-status="sendStatus" - is-disabled="!wallet"> - Confirm purchase + is-disabled="!wallet || !totalAmountStr"> + {{'Confirm purchase'|translate}} - Slide to buy + slide-send-status="sendStatus"> + {{'Slide to buy'|translate}} - + Your purchase could not be completed - + Your purchase was added to the list of pending - - Bought {{amazonGiftCard.amount}} {{amazonGiftCard.currency}} + + Bought {{amountUnitStr}} -
+
Gift card generated and ready to use.
diff --git a/www/views/confirm.html b/www/views/confirm.html index 7ba50dc10..c5f0b8e97 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -61,7 +61,7 @@ {{tx.toAddress}}
- + From
@@ -107,7 +107,7 @@ {{buttonText}} diff --git a/www/views/customAmount.html b/www/views/customAmount.html index 902671d63..f9d5aafb7 100644 --- a/www/views/customAmount.html +++ b/www/views/customAmount.html @@ -10,9 +10,9 @@ @@ -23,7 +23,7 @@
-
+
Address @@ -43,7 +43,7 @@ {{wallet.name}}
-
Receive in
+
Receive in
diff --git a/www/views/includes/cardActivity.html b/www/views/includes/cardActivity.html index 68e90fdb9..a5562bee7 100644 --- a/www/views/includes/cardActivity.html +++ b/www/views/includes/cardActivity.html @@ -8,7 +8,7 @@
{{tx.merchant.name || 'Unknown Merchant'}}
-
{{tx.merchant.location}}
+
{{tx.merchant.location}}
View Confirmation Status
@@ -19,8 +19,8 @@ {{tx.price | currency:bitpayCard.currencySymbol:2 }}
- - + +
diff --git a/www/views/includes/checkBar.html b/www/views/includes/checkBar.html new file mode 100644 index 000000000..38b3637ea --- /dev/null +++ b/www/views/includes/checkBar.html @@ -0,0 +1,10 @@ +
+
+
+
+
+ + +
+
+
diff --git a/www/views/includes/incomingDataMenu.html b/www/views/includes/incomingDataMenu.html index fbc134b57..c37c93612 100644 --- a/www/views/includes/incomingDataMenu.html +++ b/www/views/includes/incomingDataMenu.html @@ -3,7 +3,7 @@
-
Website
+
Website
@@ -16,17 +16,17 @@
-
Open website
+
Open website
 - + Cancel
-
Bitcoin Address
+
Bitcoin Address
@@ -38,27 +38,27 @@
-
Add as a contact
+
Add as a contact
 -
Send payment to this address
+
Send payment to this address
 -
Copy to clipboard
+
Copy to clipboard
 - + Cancel
-
Text
+
Text
{{data}} @@ -67,17 +67,17 @@
-
Copy to clipboard
+
Copy to clipboard
 - + Cancel
-
Private Key
+
Private Key
{{data}} @@ -86,15 +86,15 @@
-
Sweep paper wallet
+
Sweep paper wallet
 -
Copy to clipboard
+
Copy to clipboard
 - + Cancel
diff --git a/www/views/includes/logOptions.html b/www/views/includes/logOptions.html new file mode 100644 index 000000000..3729bba38 --- /dev/null +++ b/www/views/includes/logOptions.html @@ -0,0 +1,21 @@ + + +
Log options
+
+ + +
+
+
Copy to clipboard
+
+
+ + + +
+
+
Send by email
+
+
+ + diff --git a/www/views/modals/chooseFeeLevel.html b/www/views/modals/chooseFeeLevel.html index 1d65c73f8..b0155ed42 100644 --- a/www/views/modals/chooseFeeLevel.html +++ b/www/views/modals/chooseFeeLevel.html @@ -1,32 +1,84 @@ - +
{{'Bitcoin Network Fee Policy'|translate}}
- - -
-
-
- Average confirmation time: - {{avgConfirmationTime | amDurationFormat: 'minute'}} + +
+ Testnet +
+
+
+
+ + {{avgConfirmationTime | amDurationFormat: 'minute'}} + ...
-
- Current fee rate for this policy: - {{feePerSatByte}} satoshis/byte - ... + Average confirmation time +
+
+
+
+ + {{feePerSatByte}} sat/byte + + ... +
+ Current fee rate for this policy +
+
+
+ +
+
+
+ + + Transactions without fee are not supported. + +
+
+ + + Your fee is lower than recommended. + + + You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte. + +
+
-
[{{network}}]
-
- - {{level|translate}} - + +
+
+ diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index c8f750da5..144202699 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -11,7 +11,7 @@ - +
diff --git a/www/views/preferences.html b/www/views/preferences.html index 67e6a447d..64cf21c80 100644 --- a/www/views/preferences.html +++ b/www/views/preferences.html @@ -20,11 +20,6 @@ Color - - - diff --git a/www/views/preferencesFee.html b/www/views/preferencesFee.html index c55cd3f01..fdf29e4cd 100644 --- a/www/views/preferencesFee.html +++ b/www/views/preferencesFee.html @@ -24,7 +24,7 @@
- + {{level|translate}}
diff --git a/www/views/preferencesLogs.html b/www/views/preferencesLogs.html index 91e3e3261..84d0528ac 100644 --- a/www/views/preferencesLogs.html +++ b/www/views/preferencesLogs.html @@ -1,23 +1,23 @@ - + {{'Session Log' | translate}} + + + - -
- - -
+
-
-
    -
  • - +
    +
    No entries for this log level filter setting.
    +
      +
    • + + [{{l.timestamp}}] + [{{l.level}}] {{l.msg}}
      • @@ -25,4 +25,12 @@
+ + diff --git a/www/views/preferencesNotifications.html b/www/views/preferencesNotifications.html index baf9e7a05..a2d7ee725 100644 --- a/www/views/preferencesNotifications.html +++ b/www/views/preferencesNotifications.html @@ -19,6 +19,12 @@
+
+ + Notify me when transactions are confirmed + +
+ Enable email notifications @@ -43,6 +49,8 @@
+ +
diff --git a/www/views/tx-details.html b/www/views/tx-details.html index 6ef243116..de7ab9977 100644 --- a/www/views/tx-details.html +++ b/www/views/tx-details.html @@ -108,13 +108,15 @@ This transaction amount is too small compared to current Bitcoin network fees. S
- - Notify me if confirmed - +
+ + Notify me if confirmed + +
Timeline