diff --git a/i18n/docs/appstore_nl.txt b/i18n/docs/appstore_nl.txt
index aca04aa89..686cd3dbb 100644
--- a/i18n/docs/appstore_nl.txt
+++ b/i18n/docs/appstore_nl.txt
@@ -1,23 +1,23 @@
-Beveilig bitcoin op je eigen voorwaarden met een open source, multisignature rekening van BitPay.
-Copay gebruikers kunnen individueel vermogen aanhouden of financiën veilig delen met andere gebruikers door gebruik te maken van een multisignature rekening, hiermee voorkom je niet-geautoriseerde betalingen doordat meerdere goedkeuringen nodig zijn. Hier zijn een aantal manieren waarop Copay gebruikt kan worden met anderen:
+Beveilig bitcoin op je eigen voorwaarden met een open source, meervoudige ondertekening-portemonnee van BitPay.
+Copay gebruikers kunnen individueel saldo beheren of veilig financiën delen met andere gebruikers door middel van portemonnees met meervoudige ondertekening, dit voorkomt ongeautoriseerde betalingen doordat meerdere goedkeuringen nodig zijn. Hier zijn een aantal manieren waarop Copay gebruikt kan worden met anderen:
Om te sparen voor vakanties of gezamenlijke aankopen met vrienden
-Voor het bijhouden van de familie uitgaven en vergoedingen
-Voor het beheer van de fondsen en kosten van een bedrijf, club of organisatie
+Voor het bijhouden van de familieuitgaven en zakgeld
+Voor het beheer van het saldo en de uitgaven van een bedrijf, club of organisatie
-Wij hebben de volgende functies ingebouwd in deze versie van Copay voor een bitcoin-wallet die geen concessies doet op het gebied van beveiliging en toegankelijkheid:
+We hebben de volgende functies ingebouwd in deze versie van Copay voor een bitcoin portemonnee die niet inlevert op beveiliging of toegankelijkheid:
-Het creëren van meerdere rekeningen beheer in de app
-Intuïtieve multisignature beveiliging voor persoonlijke of gedeelde rekeningen
-Eenvoudig uitgaven voorstellen voor gedeelde rekeningen en groep betalingen
-Hiërarchische deterministische (HD) adres generatie en rekening back-ups
-Apparaat gebaseerde beveiliging: alle persoonlijke sleutels zijn lokaal opgeslagen, niet in de cloud
-Ondersteuning voor Bitcoin testnet rekeningen
-Synchroniseert toegang tot alle grote mobiele en desktop platforms
-Betaling-protocolondersteuning (BIP70-BIP73): gemakkelijk identificeerbare betalingsaanvragen en verifieerbare veilige bitcoin betalingen
-Ondersteuning voor 150 + valuta prijsopties en eenheid denominatie in BTC of bits
-E-mailberichten voor betalingen en transfers
-Aanpasbare rekeningen naamgeving en achtergrond kleuren
-9 ondersteunde talen (NL, CS, FR, DE, het, ES, JA, PL, RU)
+Het aanmaken en beheren van meerdere portemonnees binnen de app
+Intuïtieve meervoudige-ondertekening beveiliging voor persoonlijke of gedeelde portemonnees
+Eenvoudige bestedingsvoorstellen voor gedeelde portemonnees en groepsbetalingen
+Hiërarchisch deterministische (HD) adres generatie en portemonnee backups
+Apparaat gebaseerde beveiliging: alle privé sleutels worden lokaal opgeslagen, niet in de cloud
+Ondersteuning voor Bitcoin testnet portemonnees
+Gesynchroniseerde toegang vanaf alle grote mobiele en desktop platformen
+Ondersteuning voor betalings protocol (BIP70-BIP73): gemakkelijk te herkennen betalingsverzoeken en verifieerbaar veilige bitcoin betalingen
+Ondersteuning voor prijsweergave in 150+ valuta's en eenheid denominatie in BTC of bits
+Email meldingen voor betalingen en overdrachten
+Aanpasbare portemonnee namen en achtergrond kleuren
+10 ondersteunde talen (EN, CZ, FR, DE, IT, ES, JA, PL, RU, NL)
-Copay is gratis en open sourcesoftware draaiend op niet-merkgebonden servers, dus er is geen noodzaak om te vertrouwen op een bedrijf voor ondersteuning. Iedereen kan bijdragen aan Copay door de broncode op te vragen via GitHub (https://github.com/bitpay/copay).
+Copay is gratis open source software draaiend op niet-merkgebonden servers, dus het is niet nodig te vertrouwen op enig bedrijf voor blijvende ondersteuning. Iedereen kan de broncode van Copay inzien of er aan bijdragen via GitHub (https://github.com/bitpay/copay).
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 6c9d3b541..8d676f6b6 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-09-19 14:07-0400\n"
+"PO-Revision-Date: 2017-10-09 10:33-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(Vertraut)"
msgid "(possible double spend)"
msgstr "(mögliche Doppelausgabe)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Ein Zahlungsvorschlag kann gelöscht werden, wenn 1) Du diesen erzeugt hast und noch kein anderer Copayer unterschrieben hat, oder 2) 24 Stunden vergangen sind, seit der Vorschlag erstellt wurde."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "- {{btx.feeRateStr}}ของธุรกรรม"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr ""
@@ -48,16 +48,16 @@ msgstr ""
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:380
+#: src/js/controllers/confirm.js:401
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:374
+#: src/js/controllers/confirm.js:395
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."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "Über"
@@ -102,7 +102,7 @@ msgstr "Kontakt hinzufügen"
msgid "Add Funds"
msgstr "Guthaben aufladen"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Notiz hinzufügen"
@@ -126,7 +126,7 @@ msgstr "Ein optionales Passwort zur Sicherung der Wiederherstellungsphrase hinzu
msgid "Add as a contact"
msgstr ""
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Beschreibung hinzufügen"
@@ -161,7 +161,7 @@ msgstr "Adresstyp"
msgid "Addresses With Balance"
msgstr "Adressen mit Guthaben"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Erweitert"
@@ -216,7 +216,7 @@ msgstr "Betrag"
msgid "Amount below minimum allowed"
msgstr "Betrag unter zulässigem Minimum"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Betrag zu hoch"
@@ -248,7 +248,7 @@ msgstr "Werden Sie beobachtet? Jeder der Ihre Wiederherstellungsphrase kennt, ka
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "Wollen Sie wirklich abbrechen und dieses Wallet löschen?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr ""
@@ -301,8 +301,8 @@ msgstr "Durchschnittliche Bestätigungzeit"
msgid "BIP32 path for address derivation"
msgstr "BIP32 Pfad für die Adressen-Ableitung"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
msgstr ""
#: www/views/preferences.html:34
@@ -317,8 +317,9 @@ 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"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Backup benötigt"
@@ -335,7 +336,7 @@ msgstr "Sicherung der Wallet"
msgid "Backup your wallet before using this function"
msgstr "Sichern Sie ihr Wallet, bevor Sie diese Funktion nutzen"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Ungültige Einladung"
@@ -365,12 +366,22 @@ msgstr ""
msgid "Bitcoin Cash Support"
msgstr ""
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Bitcoin-Netzwerk Gebührenübersicht"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr ""
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
msgstr ""
@@ -444,7 +455,7 @@ msgstr "Mining-Fee Berechnung"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr ""
msgid "Cannot Create Wallet"
msgstr "Wallet kann nicht erstellt werden"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "An einem Wallet kann nicht mehrfach teilgenommen werden"
@@ -497,7 +508,7 @@ msgstr "Wählen Sie Ihre Ziel-Wallet"
msgid "Choose your source wallet"
msgstr "Wählen Sie Ihre Quell-Wallet"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Leeren"
@@ -505,16 +516,16 @@ msgstr "Leeren"
msgid "Clear cache"
msgstr "Cache leeren"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
msgstr ""
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
msgstr ""
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
msgstr ""
@@ -552,11 +563,11 @@ msgstr ""
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Bestätigen & Beenden"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr ""
@@ -580,7 +590,7 @@ msgstr "PIN bestätigen"
msgid "Confirm your new spending password"
msgstr "Bestätigen Sie Ihr neues Passwort"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Bestätigungen"
@@ -617,6 +627,10 @@ msgstr "Weiter"
msgid "Contribute Translations"
msgstr "Übersetzungen beitragen"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr ""
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Copayer nimmt bereits teil"
@@ -667,11 +681,11 @@ msgstr "Kein Zugriff auf Wallet des Servers. Überprüfen Sie bitte:"
msgid "Could not access to Amazon.com"
msgstr ""
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "Auf Wallet konnte nicht zugegriffen werden"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
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"
@@ -697,15 +711,15 @@ msgstr ""
msgid "Could not create transaction"
msgstr ""
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "Erzeugung mit erweiterten privaten Schlüssel nicht möglich"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "Erzeugung mit dem angegebenen erweiterten öffentlichen Schlüssel nicht möglich"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Wallet-Wiederherstellungsphrase nicht gültig"
@@ -717,7 +731,7 @@ msgstr "Datei konnte nicht entschlüsselt werden, bitte das Passwort überprüfe
msgid "Could not delete payment proposal"
msgstr "Zahlungsvorschlag konnte nicht gelöscht werden"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
msgstr ""
@@ -743,17 +757,17 @@ msgstr ""
msgid "Could not get transactions"
msgstr "Transaktionen konnten nicht gefunden werden"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "Import nicht möglich"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "Import nicht möglich. Bitte Datei und Berechtigungscode überprüfen"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "Beteiligung am Wallet nicht möglich"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Erstelle eine gemeinsame Wallet"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Erstelle Bitcoin-Wallet"
@@ -821,8 +835,8 @@ msgstr "Erstelle gemeinsame Wallet"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Ein {{formData.requiredCopayers}}-von-{{formData.totalCopayers}} Wallet erzeugen"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Erstellt von"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr ""
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Datum"
@@ -861,7 +875,7 @@ msgstr "Datum"
msgid "Delete"
msgstr "Löschen"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Zahlungsvorschlag löschen"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr ""
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Deaktiviert"
@@ -924,7 +938,7 @@ msgstr "Wird deine Sprache auf Crowdin nicht angezeigt? Kontaktiere den Support
msgid "Download"
msgstr "Herunterladen"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr ""
@@ -1012,14 +1026,14 @@ msgstr "Wiederherstellungsphrase eingeben (BIP39)"
msgid "Enter your email"
msgstr ""
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Passwort eingeben"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Passwort eingeben"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Passwort eingeben"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Passwort eingeben"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Passwort eingeben"
msgid "Error"
msgstr "Fehler"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Fehler beim bestätigen"
@@ -1108,11 +1122,11 @@ msgstr ""
msgid "Error creating the invoice"
msgstr ""
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Fehler beim Erstellen des Wallets"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr ""
@@ -1142,16 +1156,16 @@ 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:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Abgelaufen"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "Gültig bis"
@@ -1194,7 +1208,7 @@ msgstr "Fehler beim Exportieren"
msgid "Family vacation funds"
msgstr "Familienurlaub"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Gebühr"
@@ -1206,8 +1220,8 @@ msgstr ""
msgid "Fee level is not defined"
msgstr ""
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr ""
@@ -1281,7 +1295,7 @@ msgstr "Betrag gefunden:"
msgid "Funds to be added"
msgstr ""
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Betrag übermittelt"
@@ -1330,16 +1344,16 @@ msgstr "Starten Sie indem Sie ihr erstes hinzufügen."
msgid "Getting fee levels..."
msgstr "Entgelt-Level werden abgerufen..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr ""
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr ""
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr ""
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr ""
@@ -1350,18 +1364,20 @@ msgstr ""
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Zurück"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1397,7 +1413,7 @@ msgid "Help & Support"
msgstr "Hilfe & Support"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "Hilfe und Support-Informationen gibt es auf der Website."
@@ -1476,7 +1492,7 @@ msgstr "Ich verstehe, dass wenn diese App auf ein anderes Gerät verschoben oder
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Ich verstehe, dass mein Geld auf diesem Gerät und nicht von einem Unternehmen gesichert wird."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "Ich habe es aufgeschrieben"
@@ -1525,7 +1541,7 @@ msgstr "Wallet importieren"
msgid "Importing Wallet..."
msgstr "Wallet wird importiert..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "Um die Sicherung der Wallet zu überprüfen, geben Sie bitte Ihr Passwort ein."
@@ -1534,10 +1550,10 @@ msgstr "Um die Sicherung der Wallet zu überprüfen, geben Sie bitte Ihr Passwor
msgid "Inactive"
msgstr ""
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Unvollständig"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr ""
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Nicht ausreichendes Guthaben"
@@ -1570,6 +1586,10 @@ msgstr "Nicht ausreichendes Guthaben"
msgid "Insufficient funds for fee"
msgstr "Nicht ausreichendes Guthaben für die Gebühr"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr ""
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Ungültig"
@@ -1613,7 +1633,7 @@ msgstr ""
msgid "Is there anything we could do better?"
msgstr "Gibt es etwas, das wir besser machen können?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "Ist das richtig?"
@@ -1663,13 +1683,14 @@ msgstr "Sprache"
msgid "Last Month"
msgstr "Letzter Monat"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
msgstr ""
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Überprüfen Sie Ihre Wiederherstellungsphrase."
@@ -1741,8 +1762,8 @@ msgstr "Meh - ist in Ordnung"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Notiz"
@@ -1754,7 +1775,7 @@ msgstr ""
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr ""
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Händlernachricht"
@@ -1888,15 +1909,19 @@ msgstr "Kein Wallet ausgewählt"
msgid "No wallets available"
msgstr ""
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "Keine Wallet verfügbar um Guthaben zu erhalten"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
msgstr ""
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr ""
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr ""
@@ -1908,7 +1933,7 @@ msgstr "Normal"
msgid "Not authorized"
msgstr "Nicht berechtigt"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "Das Guthaben reicht nicht für die Gebühr"
@@ -1929,6 +1954,10 @@ msgstr "Nicht jetzt"
msgid "Note"
msgstr "Notiz"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr ""
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Hinweis: nur 1-1 (Einzelunterschrift) Wallets können verwendet werden um Bitcoins zu verkaufen"
@@ -1942,7 +1971,7 @@ msgstr "Benachrichtigungen"
msgid "Notifications by email"
msgstr ""
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr ""
@@ -1993,9 +2022,10 @@ 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:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Öffnen"
@@ -2033,6 +2063,10 @@ msgstr "Öffne Website"
msgid "Open bitcoincash.org?"
msgstr ""
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr ""
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Öffne Wallet"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Zahlung abgelehnt"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,7 +2167,7 @@ msgstr "Zahlung akzeptiert. Sie wird durch Glidera übermittelt. Falls ein Probl
msgid "Payment address was translated to new Bitcoin Cash address format:"
msgstr ""
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Zahlungsdetails"
@@ -2154,11 +2188,11 @@ msgstr "Anstehende Vorschläge"
msgid "Permanently delete this wallet."
msgstr "Wallet dauerhaft löschen."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Persönliches Wallet"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Notieren Sie bitte sorgfältig diese Phrase."
@@ -2166,7 +2200,7 @@ msgstr "Notieren Sie bitte sorgfältig diese Phrase."
msgid "Please connect a camera to get started."
msgstr "Bitte verbinden Sie eine Kamera um loszulegen."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Bitte geben Sie die Wiederherstellungsphrase ein"
@@ -2179,7 +2213,7 @@ msgstr "Bitte geben Sie die Wallet-Wiederherstellungsphrase ein"
msgid "Please enter your PIN"
msgstr "Bitte geben Sie Ihre PIN ein"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Bitte tippen Sie jedes Wort in der richtigen Reihenfolge."
@@ -2212,7 +2246,7 @@ msgstr "Adressen werden vorbereitet..."
msgid "Preparing backup..."
msgstr "Sicherung wird vorbereitet..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Zum Beenden erneut drücken"
@@ -2238,7 +2272,7 @@ msgstr "Vorschlag angenommen"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Vorschlag erstellt"
@@ -2300,12 +2334,16 @@ msgstr "Mehr anzeigen"
msgid "Read more in our Wiki"
msgstr ""
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr ""
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "Empfangen"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr ""
@@ -2463,7 +2501,7 @@ msgstr ""
msgid "Scan your fingerprint please"
msgstr "Scannen Sie bitte Ihren Fingerabdruck"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
msgstr ""
@@ -2471,7 +2509,7 @@ msgstr ""
msgid "Scanning Wallet funds..."
msgstr "Prüfe Wallet auf neue Beträge..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
msgstr ""
@@ -2544,7 +2582,7 @@ msgstr "Adressen per e-Mail versenden"
msgid "Send by email"
msgstr "Per E-Mail versenden"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Senden von"
@@ -2583,7 +2621,7 @@ msgstr "Sende maximalen Betrag"
msgid "Sending transaction"
msgstr "Sende Transaktion"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Sende {{amountStr}} aus Ihrer Wallet {{name}}"
@@ -2698,25 +2736,28 @@ msgstr "Wallet mit einer einzigen Adresse"
msgid "Skip"
msgstr "Überspringen"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr ""
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr ""
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr ""
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr ""
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr ""
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,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:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Diese Bitcoin Zahlungsaufforderung ist abgelaufen."
@@ -2944,15 +2985,15 @@ msgstr "Diese Bitcoin Zahlungsaufforderung ist abgelaufen."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "Dieses Passwort kann nicht wiederhergestellt werden. Wenn das Passwort verloren gegangen ist gibt es keine Möglichkeit mehr Ihr Geld zurück zu holen."
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Diese Wiederherstellungsphrase entstand mit einem Passwort. Zur Wiederherstellung der Wallet sind die Wiederherstellungsphrase und das Passwort erforderlich."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr ""
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Die Bestätigung dieser Transaktion kann sehr lange dauern oder verworfen werden, da vom Absender nur geringe Gebühren eingestellt wurden"
@@ -2961,14 +3002,14 @@ msgstr "Die Bestätigung dieser Transaktion kann sehr lange dauern oder verworfe
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Dieses Wallet ist nicht beim angegebenen Bitcore Wallet Service (BWS) registriert. Bitte aus den lokalen Informationen wiederherstellen"
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Zeitachse"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Touch-ID gescheitert"
msgid "Transaction"
msgstr "Transaktion"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr ""
@@ -3083,7 +3124,7 @@ msgstr "Wiederherstellungsphrase eingeben (in der Regel 12 Wörter)"
msgid "Uh oh..."
msgstr "Uh oh..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Unbestätigt"
@@ -3157,7 +3198,7 @@ msgstr "Transaktionen auf Insight anzeigen"
msgid "View Update"
msgstr "Aktualisierungen anzeigen"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Auf blockchain anzeigen"
@@ -3277,7 +3318,7 @@ msgstr "Wallet-Typ"
msgid "Wallet already exists"
msgstr "Wallet exstiert bereits"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr ""
@@ -3319,8 +3360,8 @@ msgstr "Wallet nicht gesichert"
msgid "Wallet not found"
msgstr "Wallet nicht gefunden"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Wallet nicht registriert"
@@ -3328,9 +3369,9 @@ msgstr "Wallet nicht registriert"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "Wallet ist nicht beim Wallet-Service registiert. Neu erzeugen mit \"Neues Wallet erzeugen\" und \"Erweiterte Optionen\" um die Wiederherstellungsphrase anzugeben"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "Wiederherstellungsphrase für die Wallet nicht verfügbar."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr ""
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Wallet-Dienst nicht gefunden"
msgid "Wallets"
msgstr "Wallets"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Wallets & Integrationen"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "Aufgepasst!"
msgid "We'd love to do better."
msgstr "Wir würden es gerne besser machen."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "Wir werden es auf der nächsten Seite bestätigen."
@@ -3409,7 +3446,7 @@ msgstr "Wären Sie bereit {{appName}} im App Store zu bewerten?"
msgid "Would you like to receive push notifications about payments?"
msgstr "Möchten Sie Push-Benachrichtigungen über Zahlungen erhalten?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Falsche Anzahl von Wiederherstellungswörtern:"
@@ -3445,7 +3482,7 @@ msgstr "Sie können auf GitHub die neuesten Entwicklungen ansehen und zu dieser
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "Sie können Bitcoins auf Millionen von Webseiten und Shops weltweit ausgeben."
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "Sie können es auch exportieren aus dem Erweiterten > Export."
@@ -3523,10 +3560,10 @@ msgstr "Ihre Wallet wird nie auf einem Cloud-Speicher oder einer Standard-Gerät
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "Ihre Wallet wird verschlüsselt. Der Berechtigungscode kann nicht wiederhergestellt werden. Achten Sie darauf ihn aufzuschreiben."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3545,7 +3582,7 @@ msgstr "Ihre BitPay Visa Karte(n) hinzufügen"
msgid "locked by pending payments"
msgstr "durch ausstehende Zahlungen gesperrt"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "Ich"
@@ -3557,6 +3594,10 @@ msgstr "name@beispiel.com"
msgid "preparing..."
msgstr "in Arbeit..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr ""
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr ""
@@ -3569,11 +3610,11 @@ msgstr ""
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr "{{appName}} 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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} wird für Bitcoin-Netzwerkgebühren abgezogen werden."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr ""
@@ -3581,7 +3622,7 @@ msgstr ""
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} Transaktionen werden heruntergeladen"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/es.po b/i18n/po/es.po
index fad8e7ae0..3510c1aad 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-09-20 16:53-0400\n"
+"PO-Revision-Date: 2017-10-10 08:58-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(De confianza)"
msgid "(possible double spend)"
msgstr "(Posible doble gasto)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Una propuesta de pago puede ser eliminada si 1) Tú eres el creador, y ningún otro copayer la haya firmado, o 2) hayan transcurrido 24 horas desde la creación de la propuesta."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "- {{btx.feeRateStr}} de la transacción"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "- {{tx.feeRateStr}} de la transacción"
@@ -48,16 +48,16 @@ msgstr "Solo canjeable en Mercado Livre (Brasil)"
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:380
+#: src/js/controllers/confirm.js:401
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:374
+#: src/js/controllers/confirm.js:395
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."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "Acerca de"
@@ -102,7 +102,7 @@ msgstr "Agregar contacto"
msgid "Add Funds"
msgstr "Añadir fondos"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Añadir nota"
@@ -126,7 +126,7 @@ msgstr "Agregar una contraseña opcional para asegurar la frase de recuperación
msgid "Add as a contact"
msgstr "Agregar como Contacto"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Añadir descripción"
@@ -161,7 +161,7 @@ msgstr "Tipo de dirección"
msgid "Addresses With Balance"
msgstr "Direcciones con fondos"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Avanzado"
@@ -216,7 +216,7 @@ msgstr "Importe"
msgid "Amount below minimum allowed"
msgstr "Cantidad por debajo del mínimo permitido"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Monto demasiado grande"
@@ -248,7 +248,7 @@ msgstr "¿Estás siendo observado? Cualquier persona con tu copia de seguridad p
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "¿Estás seguro de cancelar y borrar esta billetera?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "¿Está seguro de que desea eliminar este contacto?"
@@ -301,8 +301,8 @@ msgstr "Tiempo promedio de confirmación"
msgid "BIP32 path for address derivation"
msgstr "BIP32 para el camino de derivación de direcciones"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
msgstr "Billeteras BTC"
#: www/views/preferences.html:34
@@ -317,8 +317,9 @@ 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"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Necesita respaldar"
@@ -335,7 +336,7 @@ msgstr "Respaldar"
msgid "Backup your wallet before using this function"
msgstr "Respalda tu billetera para utilizar esta función"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Invitación incorrecta a la billetera"
@@ -365,12 +366,22 @@ msgstr "Saldos Bitcoin Cash (BCH)"
msgid "Bitcoin Cash Support"
msgstr "Soportar Bitcoin Cash"
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr "Billeteras Bitcoin Cash"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Política de Comisión de la Red Bitcoin"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr "Billeteras Bitcoin"
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
msgstr "Pago en Bitcoin cash"
@@ -444,7 +455,7 @@ msgstr "Calculando comisión"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "Cancelar invitación"
msgid "Cannot Create Wallet"
msgstr "No se pudo crear la billetera"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "No puede unirse a la misma billetera más de una vez"
@@ -497,7 +508,7 @@ msgstr "Elegir billetera destino"
msgid "Choose your source wallet"
msgstr "Elegir billetera de origen"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Anular"
@@ -505,16 +516,16 @@ msgstr "Anular"
msgid "Clear cache"
msgstr "Limpiar cache"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
msgstr "Click para aceptar"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
msgstr "Click para pagar"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
msgstr "Click para enviar"
@@ -552,11 +563,11 @@ msgstr "Terminadas"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Confirmar y terminar"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "Confirmar compra"
@@ -580,7 +590,7 @@ msgstr "Confirma tu PIN"
msgid "Confirm your new spending password"
msgstr "Confirme su contraseña para enviar"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Confirmaciones"
@@ -617,6 +627,10 @@ msgstr "Continuar"
msgid "Contribute Translations"
msgstr "Contribuir"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr "Copay sólo soporta Bitcoin Cash utilizando la nueva versión de direcciones"
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Ya se encuentra en esta billetera"
@@ -667,11 +681,11 @@ msgstr "No se pudo acceder a la billetera desde el servidor. Por favor verificar
msgid "Could not access to Amazon.com"
msgstr "No se pudo acceder a Amazon.com"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "No se pudo acceder a la billetera"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
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"
@@ -697,15 +711,15 @@ msgstr "No se pudo crear la factura"
msgid "Could not create transaction"
msgstr "No se pudo crear la transacción"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "No se pudo crear la billetera usando la clave privada ingresada"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "No se pudo crear con la clave pública extendida especificada"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "No se pudo crear: frase de recuperación inválida"
@@ -717,7 +731,7 @@ msgstr "No se pudo descifrar el archivo, verifique su contraseña"
msgid "Could not delete payment proposal"
msgstr "No se pudo eliminar la propuesta de pago"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
msgstr "No se pudo duplicar"
@@ -743,17 +757,17 @@ msgstr "No se pudo obtener la factura"
msgid "Could not get transactions"
msgstr "No se pudo obtener las transacciones"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "No se pudo importar"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "No se pudo importar. Verifique el archivo y la contraseña para pagos"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "No se pudo unir a la billetera"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Crear billetera compartida"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Crear billetera"
@@ -821,8 +835,8 @@ msgstr "Crear billetera compartida"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Crear billetera {{formData.requiredCopayers}}-de-{{formData.totalCopayers}}"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Creado por"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr "Comisión personalizada"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Fecha"
@@ -861,7 +875,7 @@ msgstr "Fecha"
msgid "Delete"
msgstr "Eliminar"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Eliminar Propuesta de Pago"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "Detalles"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Deshabilitado"
@@ -924,7 +938,7 @@ msgstr "¿No ves tu idioma en Crowdin? Contacta con el encargado del proyecto! N
msgid "Download"
msgstr "Descargar"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr "Duplicar a BCH"
@@ -1012,14 +1026,14 @@ msgstr "Introduce la frase de recuperación (BIP39)"
msgid "Enter your email"
msgstr "Ingresa tu correo electrónico"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Ingrese su contraseña"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Ingrese su contraseña"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Ingrese su contraseña"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Ingrese su contraseña"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Ingrese su contraseña"
msgid "Error"
msgstr "Error"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Error al confirmar"
@@ -1108,11 +1122,11 @@ msgstr "Error al crear tarjeta de regalo"
msgid "Error creating the invoice"
msgstr "Error al crear la factura"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Error al crear billetera"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "Error al obtener información de SendMax"
@@ -1142,16 +1156,16 @@ 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:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Expirada"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "Expira"
@@ -1194,7 +1208,7 @@ msgstr "Error al exportar"
msgid "Family vacation funds"
msgstr "Fondos para vacaciones en familia"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Comisión"
@@ -1206,8 +1220,8 @@ msgstr "Nivel de comisión"
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
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "Comisión:"
@@ -1281,7 +1295,7 @@ msgstr "Fondos encontrados:"
msgid "Funds to be added"
msgstr "Fondos a agregar"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Fondos transferidos"
@@ -1330,16 +1344,16 @@ msgstr "Comienza agregando el primero."
msgid "Getting fee levels..."
msgstr "Obteniendo niveles de comisión..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr "Tarjeta de Regalo"
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr "La Tarjeta de Regalo ya no esta disponible para usar"
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "Tarjeta de regalo"
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "La tarjeta de regalo expiró"
@@ -1350,18 +1364,20 @@ msgstr "Tarjeta de regalo generada y lista para usar."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Volver"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1397,7 +1413,7 @@ msgid "Help & Support"
msgstr "Ayuda & Soporte"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "La ayuda está disponible en el sitio web."
@@ -1476,7 +1492,7 @@ msgstr "Entiendo que si esta aplicación es borrada, mis fondos pueden recuperar
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Entiendo que mis fondos están protegidos por el dispositivo y no por una empresa."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "Ya he anotado"
@@ -1525,7 +1541,7 @@ msgstr "Importar billetera"
msgid "Importing Wallet..."
msgstr "Importando billetera..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "Para verificar la copia de seguridad de la billetera, por favor escriba la contraseña."
@@ -1534,10 +1550,10 @@ msgstr "Para verificar la copia de seguridad de la billetera, por favor escriba
msgid "Inactive"
msgstr "Inactivo"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Incompleta"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr "Dirección de red incorrecta"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Fondos insuficientes"
@@ -1570,6 +1586,10 @@ msgstr "Fondos insuficientes"
msgid "Insufficient funds for fee"
msgstr "Fondos insuficientes para el pago de la comisión"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr "Integraciones"
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Inválido"
@@ -1613,7 +1633,7 @@ msgstr "Factura vencida"
msgid "Is there anything we could do better?"
msgstr "¿Hay algo que podríamos mejorar?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "¿Es correcto?"
@@ -1663,13 +1683,14 @@ msgstr "Idioma"
msgid "Last Month"
msgstr "Mes pasado"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
msgstr "Más información"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Verifiquemos la copia de seguridad."
@@ -1741,8 +1762,8 @@ msgstr "Buu - está bien"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Nota"
@@ -1754,7 +1775,7 @@ msgstr "Tarjetas de Regalo Mercado Livre Brasil"
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr "Mercadolibre Gift Card Service no esta disponible en este momento. Por favor, inténtelo más tarde."
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Mensaje del comerciante"
@@ -1888,15 +1909,19 @@ msgstr "No se seleccionó una billetera"
msgid "No wallets available"
msgstr "No hay billeteras disponibles"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "No hay billeteras disponibles para recibir fondos"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
msgstr "No hay billeteras elegibles para soporte a Bitcoin Cash"
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr "Billetera no BIP44"
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr "Billeteras BTC no elegibles"
@@ -1908,7 +1933,7 @@ msgstr "Normal"
msgid "Not authorized"
msgstr "No autorizado"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "No hay suficientes fondos para la comisión"
@@ -1929,6 +1954,10 @@ msgstr "Ahora no"
msgid "Note"
msgstr "Nota"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr "Nota: Si esta billetera BCH fue duplicada desde una billetera BTC, entonces comparten la misma frase de recuperación."
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Aviso: solo billeteras 1-1 (única firma) pueden ser utilizadas para vender bitcoin"
@@ -1942,7 +1971,7 @@ msgstr "Notificaciones"
msgid "Notifications by email"
msgstr "Notificaciones por correo electrónico"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "Notificarme si se confirma"
@@ -1993,9 +2022,10 @@ 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:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Abrir"
@@ -2033,6 +2063,10 @@ msgstr "Abrir Sitio Web"
msgid "Open bitcoincash.org?"
msgstr "¿Abrir bitcoincash.org?"
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr "Abrir herramienta de recuperación."
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Abrir billetera"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Pago Rechazado"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,7 +2167,7 @@ msgstr "Pago aceptado. Se transmitirá por Glidera. En caso de que haya un probl
msgid "Payment address was translated to new Bitcoin Cash address format:"
msgstr "La dirección de pago fue traducida al nuevo formato de Bitcoin Cash:"
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Detalles del pago"
@@ -2154,11 +2188,11 @@ msgstr "Propuestas de pago pendientes"
msgid "Permanently delete this wallet."
msgstr "Eliminar esta billetera de forma permanente."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Billetera Personal"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Por favor, anota cuidadosamente esta frase."
@@ -2166,7 +2200,7 @@ msgstr "Por favor, anota cuidadosamente esta frase."
msgid "Please connect a camera to get started."
msgstr "Por favor, conecta una cámara para empezar."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Por favor ingresa la frase de recuperación"
@@ -2179,7 +2213,7 @@ msgstr "Por favor ingresa la frase de recuperación de la billetera"
msgid "Please enter your PIN"
msgstr "Ingresá tu PIN"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Escoje las palabras en el orden correcto."
@@ -2212,7 +2246,7 @@ msgstr "Preparando direcciones..."
msgid "Preparing backup..."
msgstr "Preparando copia de seguridad..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Presione nuevamente para salir"
@@ -2238,7 +2272,7 @@ msgstr "Propuesta Aceptada"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Propuesta Creada"
@@ -2300,12 +2334,16 @@ msgstr "Leer más"
msgid "Read more in our Wiki"
msgstr "Lee más en nuestra Wiki"
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr "Billetera solo lectura"
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "Recibir"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr "Recibir en"
@@ -2463,7 +2501,7 @@ msgstr "Escanear de nuevo"
msgid "Scan your fingerprint please"
msgstr "Por favor ingrese su huella digital"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
msgstr "Explora tus billeteras para Bitcoin Cash"
@@ -2471,7 +2509,7 @@ msgstr "Explora tus billeteras para Bitcoin Cash"
msgid "Scanning Wallet funds..."
msgstr "Buscando fondos en la billetera..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
msgstr "Buscando fondos..."
@@ -2544,7 +2582,7 @@ msgstr "Enviar las direcciones por email"
msgid "Send by email"
msgstr "Enviar por correo electrónico"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Enviar desde"
@@ -2583,7 +2621,7 @@ msgstr "Enviando cantidad máxima"
msgid "Sending transaction"
msgstr "Enviando transacción"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Enviando {{amountStr}} desde tu billetera {{name}}"
@@ -2698,25 +2736,28 @@ msgstr "Billetera de una sola dirección"
msgid "Skip"
msgstr "Omitir"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr "Deslizar para aceptar"
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "Deslizar para comprar"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr "Deslizar para pagar"
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr "Deslizar para enviar"
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr "Algunas de sus billeteras no pueden ser seleccionadas para darle soporte Bitcoin Cash. Pruebe acceder a sus fondos BCH utilizando la"
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,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:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Esta solicitud de pago ha caducado."
@@ -2944,15 +2985,15 @@ msgstr "Esta solicitud de pago ha caducado."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "Esta contraseña no se puede recuperar. Si la pierdes, no hay manera de que puedas recuperar los fondos."
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Esta frase de recuperación fue creada con una contraseña. Para recuperar esta billetera, la frase de recuperación y la contraseña son necesarios."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr "Este monto en la transacción es demasiado bajo comparado con las comisiones de la red Bitcoin. Para gastar estos fondos se requiere disponer de un monto superior a la comisión requerida por la red Bitcoin."
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Esta transacción podría tardar mucho tiempo en confirmar o podría caer debido a la baja comisión establecida por el remitente"
@@ -2961,14 +3002,14 @@ msgstr "Esta transacción podría tardar mucho tiempo en confirmar o podría cae
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Esta billetera no está registrada en el servidor de Bitcore Wallet Service (BWS). Debes re-crearla con la información local disponible."
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Línea de tiempo"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Falló Touch ID"
msgid "Transaction"
msgstr "Transacción"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "Transacción creada"
@@ -3083,7 +3124,7 @@ msgstr "Escribe la frase de recuperación (normalmente 12 palabras)"
msgid "Uh oh..."
msgstr "Ouch..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Sin confirmar"
@@ -3157,7 +3198,7 @@ msgstr "Ver Transacción en Insight"
msgid "View Update"
msgstr "Ver Actualización"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Ver en blockchain"
@@ -3277,7 +3318,7 @@ msgstr "Tipo de billetera"
msgid "Wallet already exists"
msgstr "La billetera ya existe"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr "El monedero ya existe en {{appName}}"
@@ -3319,8 +3360,8 @@ msgstr "Billetera sin copia de seguridad"
msgid "Wallet not found"
msgstr "Billetera no encontrada"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Billetera no registrada"
@@ -3328,9 +3369,9 @@ msgstr "Billetera no registrada"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "La billetera no esta registrado en Wallet Service. Para volver a crear, utilice \"Crear billetera\", \"Opciones avanzadas\" e ingrese la frase de recuperación"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "Frase de recuperación de la billetera no disponible."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr "Frase de recuperación de la billetera no disponible"
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Wallet Service no encontrado"
msgid "Wallets"
msgstr "Billeteras"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Billeteras & Integraciones"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "¡Cuidado!"
msgid "We'd love to do better."
msgstr "Nos encantaría hacerlo mejor."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "Se confirmará en la siguiente pantalla."
@@ -3409,7 +3446,7 @@ msgstr "¿Estaría usted dispuesto a opinar sobre {{appName}} en la app store?"
msgid "Would you like to receive push notifications about payments?"
msgstr "¿Quieres recibir notificaciones push sobre sus transacciones?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Número incorrecto de palabras:"
@@ -3445,7 +3482,7 @@ msgstr "Puede ver las últimas novedades y contribuir a nuestra aplicación de c
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "Puedes utilizar bitcoin en millones de páginas web y tiendas en todo el mundo."
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "Todavía puede exportar en Avanzados > Exportar."
@@ -3523,10 +3560,10 @@ msgstr "Tu billetera nunca se sube a la nube ni se resguarda automáticamente en
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "La clave de la billetera será cifrada. La contraseña para pagos no puede ser recuperada. Asegúrate de anotarla."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3545,7 +3582,7 @@ msgstr "agregar sus tarjetas BitPay Visa"
msgid "locked by pending payments"
msgstr "bloqueado por pagos pendientes"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "yo"
@@ -3557,6 +3594,10 @@ msgstr "nombre@ejemplo.com"
msgid "preparing..."
msgstr "preparando..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr "herramienta de recuperación."
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} en tarjeta de regalo de Amazon.com"
@@ -3569,11 +3610,11 @@ msgstr "{{amountStr}} en Tarjeta de Regalo Mercado Livre Brasil"
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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} se descontará por comisión de la red bitcoin."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} de la cantidad a enviar"
@@ -3581,7 +3622,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} de la cantidad a enviar"
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transacciones descargadas"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index ce0c91a1f..61330b1fe 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-09-20 16:53-0400\n"
+"PO-Revision-Date: 2017-10-10 08:58-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(Fiable)"
msgid "(possible double spend)"
msgstr "(double dépense possible)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Une proposition de paiement peut être supprimée si vous en êtes le créateur et qu'aucun des autres copayers n'a signé, ou si 24 heures sont passées depuis la création de la proposition."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "- {{btx.feeRateStr}} de la transaction"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "- {{tx.feeRateStr}} de la transaction"
@@ -48,16 +48,16 @@ msgstr "Seulement utilisable sur Mercado Livre (Brazil)"
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:380
+#: src/js/controllers/confirm.js:401
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:374
+#: src/js/controllers/confirm.js:395
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."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "À propos"
@@ -102,7 +102,7 @@ msgstr "Ajouter un contact"
msgid "Add Funds"
msgstr "Ajouter des fonds"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Ajouter une note"
@@ -126,7 +126,7 @@ msgstr "Ajouter un mot de passe optionnel pour sécuriser la phrase de récupér
msgid "Add as a contact"
msgstr "Ajouter comme contact"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Ajouter une description"
@@ -161,7 +161,7 @@ msgstr "Type d'adresse"
msgid "Addresses With Balance"
msgstr "Adresses avec un solde"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Paramètres avancés"
@@ -216,7 +216,7 @@ msgstr "Montant"
msgid "Amount below minimum allowed"
msgstr "Montant en dessous du minimum autorisé"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Le montant est trop élevé"
@@ -248,7 +248,7 @@ msgstr "Êtes-vous surveillé(e) ? N’importe qui peut dépenser vos bitcoins
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "Êtes-vous certain(e) de vouloir annuler et supprimer ce portefeuille ?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "Souhaitez-vous réellement supprimer ce contact ?"
@@ -301,8 +301,8 @@ msgstr "Temps de confirmation moyen "
msgid "BIP32 path for address derivation"
msgstr "Chemin BIP32 pour la dérivation de l'adresse"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
msgstr "Portefeuilles BTC"
#: www/views/preferences.html:34
@@ -317,8 +317,9 @@ msgstr "Sauvegarde requise"
msgid "Backup all livenet wallets before using this function"
msgstr "Sauvegardez tous les portefeuilles (livenet) avant d'utiliser cette fonction"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Sauvegarde requise"
@@ -335,7 +336,7 @@ msgstr "Sauvegarder le portefeuille"
msgid "Backup your wallet before using this function"
msgstr "Sauvegardez votre portefeuille avant d'utiliser cette fonction"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Mauvaise invitation de portefeuille"
@@ -365,12 +366,22 @@ msgstr "Soldes Bitcoin Cash (BCH)"
msgid "Bitcoin Cash Support"
msgstr "Prise en charge de Bitcoin Cash"
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr "Portefeuilles Bitcoin Cash"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Frais de réseau"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr "Portefeuilles Bitcoin"
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
msgstr "Paiement Bitcoin Cash"
@@ -444,7 +455,7 @@ msgstr "Calcul des frais"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "Annuler l'invitation"
msgid "Cannot Create Wallet"
msgstr "Impossible de créer le portefeuille"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "Impossible de rejoindre le même portefeuille plus d'une fois"
@@ -497,7 +508,7 @@ msgstr "Choisissez votre portefeuille de destination"
msgid "Choose your source wallet"
msgstr "Choisissez votre portefeuille source"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Effacer"
@@ -505,16 +516,16 @@ msgstr "Effacer"
msgid "Clear cache"
msgstr "Vider le cache"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
msgstr "Cliquez pour accepter"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
msgstr "Cliquez pour payer"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
msgstr "Cliquez pour envoyer"
@@ -532,7 +543,7 @@ msgstr "Fermer"
#: www/views/includes/cash.html:2
#: www/views/preferencesInformation.html:17
msgid "Coin"
-msgstr "Pièce"
+msgstr "Crypto-monnaie"
#: www/views/preferences.html:22
msgid "Color"
@@ -552,11 +563,11 @@ msgstr "Terminé"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Confirmer & Terminer"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "Confirmer l'achat"
@@ -580,7 +590,7 @@ msgstr "Confirmez votre PIN"
msgid "Confirm your new spending password"
msgstr "Confirmez votre nouveau code de dépenses"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Confirmations"
@@ -617,6 +627,10 @@ msgstr "Continuer"
msgid "Contribute Translations"
msgstr "Contribuer aux traductions"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr "Copay prend uniquement en charge le nouveau type d'adresse de Bitcoin Cash"
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Copayer déjà dans ce portefeuille"
@@ -667,11 +681,11 @@ msgstr "Impossible d'accéder au portefeuille via le serveur. Veuillez vérifier
msgid "Could not access to Amazon.com"
msgstr "Impossible d'accéder à Amazon.com"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "Impossible d’accéder au portefeuille"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Could not add message to imported wallet without shared encrypting key"
@@ -697,15 +711,15 @@ msgstr "Impossible de créer la facture"
msgid "Could not create transaction"
msgstr "Impossible de créer la transaction"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "Impossible de créer en utilisant la clé privée étendue spécifiée"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "Impossible de créer en utilisant la clé publique étendue spécifiée"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Impossible de créer : Phrase de récupération du portefeuille invalide"
@@ -717,7 +731,7 @@ msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe"
msgid "Could not delete payment proposal"
msgstr "Impossible de supprimer la proposition de paiement"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
msgstr "Impossible de dupliquer"
@@ -743,17 +757,17 @@ msgstr "Impossible d'obtenir la facture"
msgid "Could not get transactions"
msgstr "Impossible de récupérer les transactions"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "Impossible d'importer"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "Impossible d'importer. Vérifiez le fichier d'entrée et le code de dépenses"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "Impossible de rejoindre le portefeuille"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Créer un portefeuille partagé"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Créer un portefeuille bitcoin"
@@ -821,8 +835,8 @@ msgstr "Créer un portefeuille partagé"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Créer un portefeuille {{formData.requiredCopayers}}-sur-{{formData.totalCopayers}}"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Créée par"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr "Frais personnalisés"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Date"
@@ -861,7 +875,7 @@ msgstr "Date"
msgid "Delete"
msgstr "Supprimer"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Supprimer la proposition de paiement"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "Détails"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Désactivé"
@@ -924,7 +938,7 @@ msgstr "Vous ne voyez pas votre langue sur Crowdin ? Contactez le propriétaire
msgid "Download"
msgstr "Télécharger"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr "Dupliquer pour BCH"
@@ -1012,14 +1026,14 @@ msgstr "Saisissez la phrase de récupération (BIP39)"
msgid "Enter your email"
msgstr "Saisissez votre e-mail"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Écrivez votre mot de passe"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Écrivez votre mot de passe"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Écrivez votre mot de passe"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Écrivez votre mot de passe"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Écrivez votre mot de passe"
msgid "Error"
msgstr "Erreur"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Erreur à la confirmation"
@@ -1108,11 +1122,11 @@ msgstr "Erreur de création de la carte-cadeau"
msgid "Error creating the invoice"
msgstr "Erreur de création de la facture"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Erreur de création du portefeuille"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "Erreur d’obtention de l'information SendMax"
@@ -1142,16 +1156,16 @@ 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:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Expiré"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "Expire dans"
@@ -1194,7 +1208,7 @@ msgstr "Impossible d'exporter"
msgid "Family vacation funds"
msgstr "Fonds pour les vacances familiales"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Frais"
@@ -1206,8 +1220,8 @@ msgstr "Frais"
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
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "Frais :"
@@ -1281,7 +1295,7 @@ msgstr "Fonds trouvés :"
msgid "Funds to be added"
msgstr "Fonds à ajouter"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Fonds transférés"
@@ -1330,16 +1344,16 @@ msgstr "Commencez par ajouter votre premier contact."
msgid "Getting fee levels..."
msgstr "Obtention des niveaux de frais..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr "Carte-cadeau"
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr "La carte-cadeau n'est plus utilisable"
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "Carte-cadeau"
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "Carte-cadeau expirée"
@@ -1350,18 +1364,20 @@ 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/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Retour"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1397,7 +1413,7 @@ msgid "Help & Support"
msgstr "Aide & Support"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "De l'aide peut être trouvée sur le site internet (en anglais pour le moment)."
@@ -1476,7 +1492,7 @@ msgstr "Je comprends que si cette application est déplacée vers un autre appar
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Je comprends que mes fonds sont en toute sécurité sur cet appareil et non détenus par une entreprise."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "Je l'ai bien écrite"
@@ -1525,7 +1541,7 @@ msgstr "Importer un portefeuille"
msgid "Importing Wallet..."
msgstr "Importation du portefeuille..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "Afin de vérifier la sauvegarde de votre portefeuille, veuillez saisir votre mot de passe."
@@ -1534,10 +1550,10 @@ msgstr "Afin de vérifier la sauvegarde de votre portefeuille, veuillez saisir v
msgid "Inactive"
msgstr "Inactive"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Non terminé"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr "Adresse réseau invalide"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Fonds insuffisants"
@@ -1570,6 +1586,10 @@ msgstr "Fonds insuffisants"
msgid "Insufficient funds for fee"
msgstr "Fonds insuffisants pour les frais"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr "Intégrations"
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Invalide"
@@ -1613,7 +1633,7 @@ msgstr "La facture a expiré"
msgid "Is there anything we could do better?"
msgstr "Y a-t-il quelque chose que nous pourrions améliorer ?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "Est-ce correct ?"
@@ -1663,13 +1683,14 @@ msgstr "Langue"
msgid "Last Month"
msgstr "Le mois dernier"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
msgstr "En savoir plus"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Vérifions votre phrase de sauvegarde."
@@ -1741,8 +1762,8 @@ msgstr "Ça peut aller"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Note"
@@ -1754,7 +1775,7 @@ msgstr "Cartes-cadeaux Mercado Livre Brazil"
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr "Le service de carte-cadeau Mercadolibre n'est pas disponible en ce moment. Veuillez réessayer plus tard."
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Message marchand"
@@ -1888,15 +1909,19 @@ msgstr "Aucun portefeuille sélectionné"
msgid "No wallets available"
msgstr "Aucun portefeuille disponible"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "Aucun portefeuille disponible pour recevoir des fonds"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
msgstr "Aucun portefeuille n'est éligible pour Bitcoin Cash"
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr "Portefeuille non BIP44"
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr "Portefeuilles BTC non éligibles"
@@ -1908,7 +1933,7 @@ msgstr "Normaux"
msgid "Not authorized"
msgstr "Non autorisé"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "Pas assez de fonds pour les frais"
@@ -1929,6 +1954,10 @@ msgstr "Pas maintenant"
msgid "Note"
msgstr "Note"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr "Remarque : si ce portefeuille BCH a été dupliqué à partir d'un portefeuille BTC, ils partagent la même phrase de récupération."
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Note : seuls les portefeuilles 1-1 (signature unique) peuvent être utilisés pour vendre des bitcoins"
@@ -1942,7 +1971,7 @@ msgstr "Notifications"
msgid "Notifications by email"
msgstr "Notifications par e-mail"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "Me notifier si la transaction se confirme"
@@ -1993,9 +2022,10 @@ 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:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Ouvrir"
@@ -2033,6 +2063,10 @@ msgstr "Ouvrir le site internet"
msgid "Open bitcoincash.org?"
msgstr "Ouvrir bitcoincash.org ?"
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr "Ouvrir l'outil de récupération."
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Ouvrir le portefeuille"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Paiement rejeté"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,7 +2167,7 @@ msgstr "Paiement accepté. Il sera diffusé par Glidera. Dans le cas où il y a
msgid "Payment address was translated to new Bitcoin Cash address format:"
msgstr "L'adresse de paiement a été convertie au nouveau format d'adresse Bitcoin Cash :"
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Détails du paiement"
@@ -2154,11 +2188,11 @@ msgstr "Propositions en attente"
msgid "Permanently delete this wallet."
msgstr "Supprimer définitivement ce portefeuille."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Portefeuille personnel"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Veuillez écrire soigneusement cette phrase."
@@ -2166,7 +2200,7 @@ msgstr "Veuillez écrire soigneusement cette phrase."
msgid "Please connect a camera to get started."
msgstr "Veuillez connecter une caméra pour commencer."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Veuillez saisir la phrase de récupération"
@@ -2179,7 +2213,7 @@ msgstr "Veuillez saisir la phrase de récupération du portefeuille"
msgid "Please enter your PIN"
msgstr "Veuillez saisir votre PIN"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Veuillez sélectionner chaque mot dans le bon ordre."
@@ -2212,7 +2246,7 @@ msgstr "Préparation des adresses..."
msgid "Preparing backup..."
msgstr "Préparation de la sauvegarde..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Appuyez de nouveau pour quitter"
@@ -2238,7 +2272,7 @@ msgstr "Proposition acceptée"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Proposition créée"
@@ -2300,12 +2334,16 @@ msgstr "En savoir plus"
msgid "Read more in our Wiki"
msgstr "Lisez notre Wiki pour en savoir plus"
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr "Portefeuille en lecture seule"
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "Recevoir"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr "Recevoir dans"
@@ -2463,7 +2501,7 @@ msgstr "Réanalyser"
msgid "Scan your fingerprint please"
msgstr "Veuillez scanner votre empreinte digitale"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
msgstr "Analyser vos portefeuilles pour Bitcoin Cash"
@@ -2471,7 +2509,7 @@ msgstr "Analyser vos portefeuilles pour Bitcoin Cash"
msgid "Scanning Wallet funds..."
msgstr "Analyse des fonds du portefeuille..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
msgstr "Analyse des fonds..."
@@ -2544,7 +2582,7 @@ msgstr "Envoyer les adresses par e-mail"
msgid "Send by email"
msgstr "Envoyer par e-mail"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Envoyer à partir de"
@@ -2583,7 +2621,7 @@ msgstr "Envoi du montant maximal"
msgid "Sending transaction"
msgstr "Envoi de la transaction"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Envoi de {{amountStr}} depuis votre portefeuille {{name}}"
@@ -2698,25 +2736,28 @@ msgstr "Portefeuille d'adresse unique"
msgid "Skip"
msgstr "Ignorer"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr "Faites glisser pour accepter"
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "Faites glisser pour acheter"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr "Faites glisser pour payer"
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr "Faites glisser pour envoyer"
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr "Certains de vos portefeuilles ne sont pas éligibles à Bitcoin Cash. Vous pouvez essayer d’avoir accès aux fonds BCH de ces portefeuilles à l’aide de"
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,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:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Cette demande de paiement bitcoin a expiré."
@@ -2944,15 +2985,15 @@ msgstr "Cette demande de paiement bitcoin a expiré."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "Ce mot de passe ne peut pas être récupéré. Si le mot de passe est perdu, il n’y a aucun moyen pour vous de récupérer vos fonds."
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Cette phrase de récupération a été créée avec un mot de passe. Pour récupérer ce portefeuille, la phrase de récupération et le mot de passe sont requis."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr "Ce montant de transaction est trop faible par rapport aux actuels frais de réseau Bitcoin. La dépense de ces fonds demandera des frais de réseau Bitcoin comparables aux fonds eux-mêmes."
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Cette transaction pourrait prendre beaucoup de temps pour être confirmée ou pourrait être abandonnée à cause du faible niveau de frais fixé par l'expéditeur"
@@ -2961,14 +3002,14 @@ msgstr "Cette transaction pourrait prendre beaucoup de temps pour être confirm
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BWS) donné. Vous pouvez le recréer depuis l'information locale."
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Chronologie"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Touch ID a échoué"
msgid "Transaction"
msgstr "Transaction"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "Transaction créée"
@@ -3083,7 +3124,7 @@ msgstr "Saisissez la phrase de récupération (généralement 12 mots)"
msgid "Uh oh..."
msgstr "Oh là là..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Non confirmée"
@@ -3157,7 +3198,7 @@ msgstr "Voir la transaction sur Insight"
msgid "View Update"
msgstr "Voir la mise à jour"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Voir sur la blockchain"
@@ -3277,7 +3318,7 @@ msgstr "Type de portefeuille"
msgid "Wallet already exists"
msgstr "Le portefeuille existe déjà"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr "Le portefeuille existe déjà dans {{appName}}"
@@ -3319,8 +3360,8 @@ msgstr "Le portefeuille n'est pas sauvegardé"
msgid "Wallet not found"
msgstr "Portefeuille introuvable"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Portefeuille non enregistré"
@@ -3328,9 +3369,9 @@ msgstr "Portefeuille non enregistré"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "Le portefeuille n'est pas enregistré au Wallet Service. Vous pouvez le recréer depuis « Créer » en utilisant les « Options avancées » pour configurer votre phrase de récupération"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "La phrase de récupération du portefeuille est indisponible."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr "La phrase de récupération du portefeuille n'est pas disponible"
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Wallet Service introuvable"
msgid "Wallets"
msgstr "Portefeuilles"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Portefeuilles & intégrations"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "Méfiez-vous !"
msgid "We'd love to do better."
msgstr "Nous serions ravis de faire mieux."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "Nous allons la confirmer sur l’écran suivant."
@@ -3409,7 +3446,7 @@ msgstr "Seriez-vous prêt à évaluer {{appName}} dans la boutique d'application
msgid "Would you like to receive push notifications about payments?"
msgstr "Souhaitez-vous recevoir des notifications relatives aux paiements ?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Nombre incorrect de mots de récupération :"
@@ -3445,7 +3482,7 @@ msgstr "Vous pouvez voir les derniers développements et contribuer à cette app
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "Vous pouvez dépenser des bitcoins dans des millions de sites internet et de boutiques à travers le monde."
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "Vous pouvez l’exporter depuis le menu « Avancé » > « Exporter »."
@@ -3523,10 +3560,10 @@ msgstr "Votre portefeuille n’est jamais enregistré en dehors de votre apparei
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "La clé de votre portefeuille sera chiffrée. Le code de dépenses ne peut pas être récupéré. N'oubliez pas de l'écrire."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3545,7 +3582,7 @@ msgstr "ajoutez vos cartes BitPay Visa"
msgid "locked by pending payments"
msgstr "verrouillés par les paiements en attente"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "moi"
@@ -3557,6 +3594,10 @@ msgstr "nom@exemple.com"
msgid "preparing..."
msgstr "préparation..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr "l'outil de récupération."
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} pour la carte-cadeau Amazon.com"
@@ -3569,11 +3610,11 @@ msgstr "{{amountStr}} pour la carte-cadeau Mercado Livre Brazil"
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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} du montant d'envoi"
@@ -3581,7 +3622,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} du montant d'envoi"
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transactions téléchargées"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 3265e061c..6750d992f 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-09-20 16:53-0400\n"
+"PO-Revision-Date: 2017-10-09 10:33-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(Fidato)"
msgid "(possible double spend)"
msgstr "(possibile doppia spesa)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Una proposta di pagamento può essere eliminata se 1) Tu sei il creatore e nessun altro copayer ha firmato, oppure 2) Sono passate 24 ore da quando la proposta e' stata creata."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "- {{btx.feeRateStr}} della transazione"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "- {{tx.feeRateStr}} della transazione"
@@ -48,16 +48,16 @@ msgstr "Solo rimborsabili su Mercado Livre (Brasile)"
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:380
+#: src/js/controllers/confirm.js:401
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:374
+#: src/js/controllers/confirm.js:395
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."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "Informazioni"
@@ -102,7 +102,7 @@ msgstr "Aggiungi Contatto"
msgid "Add Funds"
msgstr "Aggiungere fondi"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Aggiungi Memo"
@@ -126,7 +126,7 @@ msgstr "Aggiungere una password facoltativa per proteggere la frase di recupero"
msgid "Add as a contact"
msgstr "Aggiungi come contatto"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Aggiungi descrizione"
@@ -161,7 +161,7 @@ msgstr "Tipo di indirizzo"
msgid "Addresses With Balance"
msgstr "Indirizzi con saldo"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Avanzato"
@@ -216,7 +216,7 @@ msgstr "Ammontare"
msgid "Amount below minimum allowed"
msgstr "Importo inferiore al minimo consentito"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Quantità troppo grande"
@@ -248,7 +248,7 @@ msgstr "Siete osservati? Chiunque con la vostra frase di recupero può accedere
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "Sei sicuro di voler eliminare questo portafoglio?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "Sei sicuro di voler cancellare questo contatto?"
@@ -301,8 +301,8 @@ msgstr "Tempo previsto per la conferma"
msgid "BIP32 path for address derivation"
msgstr "Percorso BIP32 per generare l'indirizzo"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
msgstr "Portafogli BTC"
#: www/views/preferences.html:34
@@ -317,8 +317,9 @@ 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"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Backup necessario"
@@ -335,7 +336,7 @@ msgstr "Backup portafoglio"
msgid "Backup your wallet before using this function"
msgstr "Eseguire il backup del tuo portafoglio prima di utilizzare questa funzione"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Invito al wallet non corretto"
@@ -365,12 +366,22 @@ msgstr "Saldi di Bitcoin Cash (BCH)"
msgid "Bitcoin Cash Support"
msgstr "Supporto Bitcoin Cash"
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Criterio delle Commissioni del Bitcoin Network"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr ""
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
msgstr "Pagamento Bitcoin Cash"
@@ -444,7 +455,7 @@ msgstr "Calcolo commissione"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "Annulla invito"
msgid "Cannot Create Wallet"
msgstr "Impossibile creare portafoglio"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "Non è possibile aggiungere un portafoglio più di una volta"
@@ -497,7 +508,7 @@ msgstr "Scegli il tuo portafoglio di destinazione"
msgid "Choose your source wallet"
msgstr "Scegli il tuo portafoglio di origine"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Elimina"
@@ -505,16 +516,16 @@ msgstr "Elimina"
msgid "Clear cache"
msgstr "Svuota la cache"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
msgstr "Fare clic per accettare"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
msgstr "Fai clic per pagare"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
msgstr "Clicca per inviare"
@@ -552,11 +563,11 @@ msgstr "Completato"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Confirm & concludi"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "Conferma acquisto"
@@ -580,7 +590,7 @@ msgstr "Conferma il tuo PIN"
msgid "Confirm your new spending password"
msgstr "Conferma la tua nuova password di spesa"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Conferme"
@@ -617,6 +627,10 @@ msgstr "Continua"
msgid "Contribute Translations"
msgstr "Contribuisci alle traduzioni"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr "Copay supporta Bitcoin Cash soltanto utilizzando la nuova versione di indirizzi"
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Copayer già in questo portafoglio"
@@ -667,11 +681,11 @@ msgstr "Non può accedere al portafoglio sul server. Si prega di controllare:"
msgid "Could not access to Amazon.com"
msgstr "Impossibile accedere ad Amazon.com"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "Impossibile accedere al portafoglio"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
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"
@@ -697,15 +711,15 @@ msgstr "Non è stato creata la fattura"
msgid "Could not create transaction"
msgstr "Non è possibile creare la transazione"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "Non posso crearlo utilizzando la chiave privata estesa specificata"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "Non è possibile creare usando questa chiave estesa pubblica"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Impossibile creare: Frase di recupero portafoglio non valida"
@@ -717,7 +731,7 @@ msgstr "Impossibile decifrare il file, controlla la tua password"
msgid "Could not delete payment proposal"
msgstr "Impossibile eliminare la proposta di pagamento"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
msgstr "Duplicazione non riuscita"
@@ -743,17 +757,17 @@ msgstr "La fattura non puo essere creata"
msgid "Could not get transactions"
msgstr "Non è possibile ottenere le transazioni"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "Impossibile importare"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "Impossibile importare. Controlla il file da importare e la password di spesa"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "Impossibile partecipare al portafoglio"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Creare portafoglio condiviso"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Creare portafoglio bitcoin"
@@ -821,8 +835,8 @@ msgstr "Creare portafoglio condiviso"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Creare il portafoglio di {{formData.requiredCopayers}}-di-{{formData.totalCopayers}}"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Creato da"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr "Commissione personalizzata"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Data"
@@ -861,7 +875,7 @@ msgstr "Data"
msgid "Delete"
msgstr "Elimina"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Elimina Proposta di Pagamento"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "Dettagli"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Disabilitato"
@@ -924,7 +938,7 @@ msgstr "Non vedi la tua lingua su Crowdin? Contatta il proprietario su Crowdin!
msgid "Download"
msgstr "Download"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr "Duplicato per BCH"
@@ -1012,14 +1026,14 @@ msgstr "Inserire la frase di recupero (BIP39)"
msgid "Enter your email"
msgstr "Inserisci la tua e-mail"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Inserisci la tua password"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Inserisci la tua password"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Inserisci la tua password"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Inserisci la tua password"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Inserisci la tua password"
msgid "Error"
msgstr "Errore"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Errore di conferma"
@@ -1108,11 +1122,11 @@ msgstr "Errore nella creazione della Gift card"
msgid "Error creating the invoice"
msgstr "Errore nella creazione della fattura"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Errore creazione portafoglio"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "Errore nel recupero di informazione SendMax"
@@ -1142,16 +1156,16 @@ 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:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Scaduta"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "Scadenza"
@@ -1194,7 +1208,7 @@ msgstr "Esportazione non riuscita"
msgid "Family vacation funds"
msgstr "Fondi vacanza di famiglia"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Tassa"
@@ -1206,8 +1220,8 @@ msgstr "Livello della commissione"
msgid "Fee level is not defined"
msgstr "Livello commissione non definito"
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "Commissione:"
@@ -1281,7 +1295,7 @@ msgstr "Fondi trovati:"
msgid "Funds to be added"
msgstr "Fondi da aggiungere"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Fondi trasferiti"
@@ -1330,16 +1344,16 @@ msgstr "Inizia aggiungendo il tuo primo."
msgid "Getting fee levels..."
msgstr "Ottenendo i livelli di commissione..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr ""
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr "Gift Card non è più disponibile per l'uso"
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "Carta regalo"
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "Carta regalo scaduta"
@@ -1350,18 +1364,20 @@ msgstr "Carta regalo generata e pronta all'uso."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Indietro"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1397,7 +1413,7 @@ msgid "Help & Support"
msgstr "Aiuto e Assistenza"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "Guida e informazioni di supporto tecnico sono disponibili sul sito web."
@@ -1476,7 +1492,7 @@ msgstr "Ho compreso che se questa app sarà trasferita ad un altro dispositivo o
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Ho capito che i miei fondi sono custoditi in sicurezza in questa dispositivo, non da un'azienda."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "L'ho scritto"
@@ -1525,7 +1541,7 @@ msgstr "Importa un portafoglio"
msgid "Importing Wallet..."
msgstr "Importazione del Portafoglio..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "Per verificare il backup del tuo portafoglio, inserire la password."
@@ -1534,10 +1550,10 @@ msgstr "Per verificare il backup del tuo portafoglio, inserire la password."
msgid "Inactive"
msgstr "Inattivo"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Incompleto"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr "Indirizzo di rete non corretto"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Fondi insufficienti"
@@ -1570,6 +1586,10 @@ msgstr "Fondi insufficienti"
msgid "Insufficient funds for fee"
msgstr "Fondi insufficienti per la commissione"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr ""
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Invalido"
@@ -1613,7 +1633,7 @@ msgstr "Fattura scaduta"
msgid "Is there anything we could do better?"
msgstr "C'è qualcosa che potevamo fare meglio?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "È corretto?"
@@ -1663,13 +1683,14 @@ msgstr "Lingua"
msgid "Last Month"
msgstr "Scorso Mese"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
msgstr "Ulteriori informazioni"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Verifichiamo la tua frase di backup."
@@ -1741,8 +1762,8 @@ msgstr "Beh - è tutto ok"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Nota"
@@ -1754,7 +1775,7 @@ msgstr "Carte regalo di Mercado Livre Brasile"
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr "Il Servizio MercadoLibre Gift Card non è disponibile in questo momento. Si prega di provare più tardi."
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Messaggio dal commerciante"
@@ -1888,15 +1909,19 @@ msgstr "Nessun portafoglio selezionato"
msgid "No wallets available"
msgstr "Nessun portafoglio disponibile"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "Nessun portafoglo disponibile per ricevere i fondi"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
msgstr "Nessun portafogli idoneo al supporto di Bitcoin Cash"
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr "Portafoglio non BIP44"
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr "Portafogli BTC non ammissibili"
@@ -1908,7 +1933,7 @@ msgstr "Normale"
msgid "Not authorized"
msgstr "Non autorizzato"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "Non ci sono abbastanza fondi per la commissione"
@@ -1929,6 +1954,10 @@ msgstr "Non ora"
msgid "Note"
msgstr "Nota"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr "Nota: se questo portafoglio BCH è stato duplicato da un portafoglio BTC, condividono la stessa frase di recupero."
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Avviso: solo i portafogli 1-1 (con singola firma) possono essere utilizzati per vendere bitcoin"
@@ -1942,7 +1971,7 @@ msgstr "Notifiche"
msgid "Notifications by email"
msgstr "Notifiche via email"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "Notificami se confermato"
@@ -1993,9 +2022,10 @@ 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:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Apri"
@@ -2033,6 +2063,10 @@ msgstr "Apri sito"
msgid "Open bitcoincash.org?"
msgstr "Aprire bitcoincash.org?"
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr "Aprire lo strumento di recupero."
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Apri Portafoglio"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Pagamento Rifiutato"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,7 +2167,7 @@ msgstr "Pagamento accettato. Esso sarà trasmesso attraverso la rete Glidera. Ne
msgid "Payment address was translated to new Bitcoin Cash address format:"
msgstr "Indirizzo per il pagamento è stato tradotto al nuovo formato di indirizzo Bitcoin Cash:"
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Dettagli pagamento"
@@ -2154,11 +2188,11 @@ msgstr "Proposte in attesa"
msgid "Permanently delete this wallet."
msgstr "Eliminare definitivamente questo portafoglio."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Portafoglio Personale"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Si prega di annotare accuratamente questa frase."
@@ -2166,7 +2200,7 @@ msgstr "Si prega di annotare accuratamente questa frase."
msgid "Please connect a camera to get started."
msgstr "Si prega di collegare una telecamera per iniziare."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Si prega di inserire la frase di recupero"
@@ -2179,7 +2213,7 @@ msgstr "Si prega di inserire la frase di recupero del portafoglio"
msgid "Please enter your PIN"
msgstr "Inserisci il tuo PIN"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Si prega di toccare ogni parola nell'ordine corretto."
@@ -2212,7 +2246,7 @@ msgstr "Preparazione indirizzi..."
msgid "Preparing backup..."
msgstr "Preparando il backup..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Premi ancora per uscire"
@@ -2238,7 +2272,7 @@ msgstr "Proposta accettata"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Proposta creata"
@@ -2300,12 +2334,16 @@ msgstr "Ulteriori informazioni"
msgid "Read more in our Wiki"
msgstr "Per saperne di più sul nostro Wiki"
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr "Portafoglio in solo lettura"
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "Ricevi"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr "Ricevere in"
@@ -2463,7 +2501,7 @@ msgstr "Ripetere la scansione"
msgid "Scan your fingerprint please"
msgstr "Per cortesia procedere alla scansione dell'impronta digitale"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
msgstr "Cercare nei tuoi portafogli per Bitcoin Cash"
@@ -2471,7 +2509,7 @@ msgstr "Cercare nei tuoi portafogli per Bitcoin Cash"
msgid "Scanning Wallet funds..."
msgstr "Scansione fondi Portafoglio..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
msgstr "Scansione dei fondi..."
@@ -2544,7 +2582,7 @@ msgstr "Invia indirizzi via Email"
msgid "Send by email"
msgstr "Invia via email"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Inviata Da"
@@ -2583,7 +2621,7 @@ msgstr "Invio dell'importo massimo"
msgid "Sending transaction"
msgstr "Invio transazione"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "L'invio di {{amountStr}} dal tuo portafoglio {{name}}"
@@ -2698,25 +2736,28 @@ msgstr "Singolo indirizzo di portafoglio"
msgid "Skip"
msgstr "Salta"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr "Trascina per accettare"
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "Trascina per acquistare"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr "Trascina per pagare"
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr "Trascina per inviare"
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr "Alcuni dei vostri portafogli non sono ammissibili al supporto di Bitcoin Cash. È possibile tentare di accedere ai fondi BCH da questi portafogli utilizzando il"
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,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:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Questa richiesta di pagamento in bitcoin è scaduta."
@@ -2944,15 +2985,15 @@ msgstr "Questa richiesta di pagamento in bitcoin è scaduta."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "Questa password non può essere recuperata. Se si dimentica la password, non c'è alcun modo possibile per recuperare i fondi."
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Questa frase di recupero è stata creata con una password. Per recuperare questo portafoglio sono necessari sia la frase di recupero e che la password."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr "Questo importo della transazione è troppo piccolo rispetto alle attuali commissioni della rete Bitcoin. Per spendere questi fondi sarà necessaria una commissione Bitcoin paragonabile ai fondi stessi."
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Questa operazione potrebbe richiedere molto tempo per essere confermata o potrebbe essere abbandonata a causa delle commissioni basse impostate dal mittente"
@@ -2961,14 +3002,14 @@ msgstr "Questa operazione potrebbe richiedere molto tempo per essere confermata
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Questo portafoglio non è registrato al Bitcore Wallet Service (BWS). Puoi ricrearlo dalle informazioni locali."
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Cronologia"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Touch ID Fallito"
msgid "Transaction"
msgstr "Transazione"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "Transazione creata"
@@ -3083,7 +3124,7 @@ msgstr "Digitare la Frase di Recupero (tipicamente 12 parole)"
msgid "Uh oh..."
msgstr "Oh oh..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Non confermato"
@@ -3157,7 +3198,7 @@ msgstr "Visualizzazione della transazione su Insight"
msgid "View Update"
msgstr "Visualizza aggiornamenti"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Mostra su blockchain"
@@ -3277,7 +3318,7 @@ msgstr "Tipo di portafoglio"
msgid "Wallet already exists"
msgstr "Il portafoglio esiste già"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr "Portafoglio è già in {{appName}}"
@@ -3319,8 +3360,8 @@ msgstr "Portafoglio senza backup"
msgid "Wallet not found"
msgstr "Portafoglio non trovato"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Portafoglio non registrato"
@@ -3328,9 +3369,9 @@ msgstr "Portafoglio non registrato"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "Portafoglio non registrato presso il servizio di portafoglio. Ricrearlo da \"Creare portafoglio\" tramite \"Opzioni avanzate\" per impostare la tua frase di recupero"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "Frase di recupero del portafoglio non disponibile."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr "Frase di recupero portafoglio non disponibile"
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Wallet service non trovato"
msgid "Wallets"
msgstr "Portafogli"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Portafogli & integrazioni"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "Attento!"
msgid "We'd love to do better."
msgstr "Ci piacerebbe fare di più."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "Confermeremo la schermata successiva."
@@ -3409,7 +3446,7 @@ msgstr "Sareste disposti a votare {{appName}} sull'app store?"
msgid "Would you like to receive push notifications about payments?"
msgstr "Vorresti ricevere le notifiche push sui pagamenti?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Numero errato delle parole di recupero:"
@@ -3445,7 +3482,7 @@ msgstr "Potete vedere gli ultimi sviluppi e contribuire a questa applicazione op
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "Si può spendere bitcoin in milioni di siti web e negozi in tutto il mondo."
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "È comunque possibile esportare da Avanzate > Esporta."
@@ -3523,10 +3560,10 @@ msgstr "Il tuo portafoglio non viene mai salvato in archiviazione cloud o nel no
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "La chiave del tuo portafoglio verrà cifrata. La Password Per Spendere non può essere recuperata. Assicurati di scrivertela."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3545,7 +3582,7 @@ msgstr "aggiungi la tua carta(e) BitPay Visa"
msgid "locked by pending payments"
msgstr "bloccati da pagamenti in sospeso"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "io"
@@ -3557,6 +3594,10 @@ msgstr "nome@esempio.com"
msgid "preparing..."
msgstr "preparazione..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr "strumento di recupero."
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} per una carta regalo Amazon.com"
@@ -3569,11 +3610,11 @@ msgstr "{{amountStr}} per Mercado Livre Brasile Gift Card"
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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} verranno detratti come commissione per il network."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} dell'importo d'invio"
@@ -3581,7 +3622,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} dell'importo d'invio"
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transazioni scaricate"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 31580f997..8bcaf65bc 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-09-19 14:07-0400\n"
+"PO-Revision-Date: 2017-10-09 10:33-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(信頼済み)"
msgid "(possible double spend)"
msgstr "(二重払い可能性あり)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* 送金の提案の取下げは①他のウォレット参加者に署名されていなかった場合、提案者に提案を取り下げることができます。②提案の起案から24時間が経っても解決しなかった場合、全員に取り下げることができます。"
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "- {{btx.feeRateStr}}のレート"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "- {{tx.feeRateStr}}のレート"
@@ -48,16 +48,16 @@ msgstr "Mercado Livre (ブラジル)のみで引き換え可能"
msgid "A member of the team will review your feedback as soon as possible."
msgstr "ただちに開発メンバーでいただいた評価を拝読し参考にさせていただきます。"
-#: src/js/controllers/confirm.js:380
+#: src/js/controllers/confirm.js:401
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "注意：合計{{amountAboveMaxSizeStr}} を除外しました。取引に許可される最大サイズを超えました"
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:395
msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided."
msgstr "注意：合計 {{amountBelowFeeStr}} を除外しました。これらのビットコインは手数料よりも低い額となるため除外しました。"
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "このアプリについて"
@@ -102,7 +102,7 @@ msgstr "連絡先を追加"
msgid "Add Funds"
msgstr "資金を追加"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "メモを追加"
@@ -126,7 +126,7 @@ msgstr "フレーズを守るために任意のパスワードをかけて下さ
msgid "Add as a contact"
msgstr "連絡先に追加"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "詳細を追加"
@@ -161,7 +161,7 @@ msgstr "アドレスの種類"
msgid "Addresses With Balance"
msgstr "残高のあるアドレス"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "上級者向け"
@@ -216,7 +216,7 @@ msgstr "金額"
msgid "Amount below minimum allowed"
msgstr "送金可能最少額を下回っています"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "金額が大きすぎます"
@@ -249,7 +249,7 @@ msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "本当にこのウォレットをキャンセルし、削除しても\n"
"宜しいですか？"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "本当にこの連絡先を削除しますか？"
@@ -303,9 +303,9 @@ msgstr "平均承認時間"
msgid "BIP32 path for address derivation"
msgstr "階級アドレス派生のパス"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
-msgstr ""
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
+msgstr "ビットコインウォレット"
#: www/views/preferences.html:34
msgid "Backup"
@@ -319,8 +319,9 @@ msgstr "要バックアップ"
msgid "Backup all livenet wallets before using this function"
msgstr "この機能を使う前に必ず全てのウォレットの復元フレーズのバックアップを取って下さい！"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "要バックアップ"
@@ -337,7 +338,7 @@ msgstr "ウォレットをバックアップ"
msgid "Backup your wallet before using this function"
msgstr "この機能を使う前に必ず復元フレーズのバックアップを取って下さい！"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "不正なウォレット招待コード"
@@ -360,12 +361,17 @@ msgstr "ビットコインアドレス"
#: www/views/cashScan.html:4
msgid "Bitcoin Cash (BCH) Balances"
-msgstr ""
+msgstr "ビーキャッシュ (BCH) 残高"
#: www/views/preferencesCash.html:3
#: www/views/tab-settings.html:47
msgid "Bitcoin Cash Support"
-msgstr ""
+msgstr "ビーキャッシュ対応"
+
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr "ビーキャッシュウォレット"
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
@@ -373,9 +379,14 @@ msgstr ""
msgid "Bitcoin Network Fee Policy"
msgstr "ビットコインネットワークの手数料設定"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr "ビットコインウォレット"
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
-msgstr ""
+msgstr "ビーキャッシュペイメント"
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -446,7 +457,7 @@ msgstr "手数料計算中..."
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -471,7 +482,7 @@ msgstr "招待状のキャンセル"
msgid "Cannot Create Wallet"
msgstr "ウォレットを作成できません。"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "同じ端末で同じウォレットに複数回参加することができません。"
@@ -499,7 +510,7 @@ msgstr "宛先ウォレットの選択"
msgid "Choose your source wallet"
msgstr "送金元のウォレットを選択して下さい"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "やり直し"
@@ -507,19 +518,19 @@ msgstr "やり直し"
msgid "Clear cache"
msgstr "キャッシュを消去"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
-msgstr ""
+msgstr "クリックして承諾"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
-msgstr ""
+msgstr "クリックして支払う"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
-msgstr ""
+msgstr "クリックして送る"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -534,7 +545,7 @@ msgstr "閉じる"
#: www/views/includes/cash.html:2
#: www/views/preferencesInformation.html:17
msgid "Coin"
-msgstr ""
+msgstr "別通貨切り替え"
#: www/views/preferences.html:22
msgid "Color"
@@ -554,11 +565,11 @@ msgstr "完了"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -570,7 +581,6 @@ msgid "Confirm & Finish"
msgstr "承諾して終了する"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "購入の確認"
@@ -582,7 +592,7 @@ msgstr "確認のためPINを再入力してください"
msgid "Confirm your new spending password"
msgstr "新しい送金時パスワードを確認してください"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "承認回数"
@@ -619,6 +629,10 @@ msgstr "続ける"
msgid "Contribute Translations"
msgstr "翻訳に協力"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr "Copay のビーキャッシュはビットコインと完全に異なる別通貨なので、アドレスの頭文字が異なります。"
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "ウォレット参加者が既に存在しています。"
@@ -669,11 +683,11 @@ msgstr "サーバーにてウォレットの確認ができませんでした。
msgid "Could not access to Amazon.com"
msgstr "Amazon.comにアクセスできませんでした。"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "ウォレットにアクセスできませんでした。"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "共有キー無しでインポートされたウォレットへのメッセージの追加ができません"
@@ -699,15 +713,15 @@ msgstr "請求を作成できませんでした"
msgid "Could not create transaction"
msgstr "取引を作成できませんでした。"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "指定された拡張秘密鍵で作成できませんでした。"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "指定された拡張公開鍵で作成できませんでした。"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "作成できません：ウォレットの復元フレーズが不正です。"
@@ -719,9 +733,9 @@ msgstr "複合化できませんでした。パスワードが正しいかご確
msgid "Could not delete payment proposal"
msgstr "送金の提案を削除できませんでした"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
-msgstr ""
+msgstr "複製できませんでした。"
#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
@@ -745,17 +759,17 @@ msgstr "請求の取得ができませんでした"
msgid "Could not get transactions"
msgstr "取引を取得できませんでした。"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "インポートできませんでした。"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "インポートできませんでした。入力ファイルとパスワードが正しいかご確認下さい。"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "ウォレットに参加できませんでした。"
@@ -806,7 +820,7 @@ msgid "Create Shared Wallet"
msgstr "共有ウォレットを作成"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "ビットコインウォレット作成"
@@ -823,8 +837,8 @@ msgstr "共有ウォレットを作成"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "{{formData.requiredCopayers}}-of-{{formData.totalCopayers}} ウォレットを作成"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "作成者"
@@ -854,8 +868,8 @@ msgid "Custom Fee"
msgstr "カスタム手数料"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "日付"
@@ -863,7 +877,7 @@ msgstr "日付"
msgid "Delete"
msgstr "削除する"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "送金の提案を削除"
@@ -903,7 +917,7 @@ msgid "Details"
msgstr "詳細"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "無効"
@@ -926,13 +940,13 @@ msgstr "ご自分の言語はCrowdinで見当たりませんか？Crowdinの管
msgid "Download"
msgstr "ダウンロード"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
-msgstr ""
+msgstr "ビーキャッシュウォレットを複製"
#: src/js/services/onGoingProcess.js:49
msgid "Duplicating wallet..."
-msgstr ""
+msgstr "ウォレットを複製しています..."
#: www/views/addresses.html:19
msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment."
@@ -961,7 +975,7 @@ msgstr "未使用アドレスを生成しすぎたため、これ以上アドレ
#: www/views/preferencesCash.html:17
msgid "Enable Bitcoin Cash wallet creation and operation within the App."
-msgstr ""
+msgstr "アプリ内でのビーキャッシュのウォレット作成及び操作を有効化する。"
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
@@ -981,7 +995,7 @@ msgstr "始めるためにカメラを有効にして下さい。"
#: www/views/tab-settings.html:49
msgid "Enabled"
-msgstr ""
+msgstr "有効"
#: src/js/services/walletService.js:1047
#: src/js/services/walletService.js:1062
@@ -1014,14 +1028,14 @@ msgstr "復元フレーズの単語をご入力下さい。"
msgid "Enter your email"
msgstr "メールアドレスを入力してください"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "パスワードを入力して下さい。"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1031,7 +1045,7 @@ msgstr "パスワードを入力して下さい。"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1057,8 +1071,8 @@ msgstr "パスワードを入力して下さい。"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1083,7 +1097,7 @@ msgstr "パスワードを入力して下さい。"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1097,7 +1111,7 @@ msgstr "パスワードを入力して下さい。"
msgid "Error"
msgstr "エラー"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "確認のエラー"
@@ -1110,11 +1124,11 @@ msgstr "ギフトカード作成時にエラー"
msgid "Error creating the invoice"
msgstr "請求の作成中にエラー"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "ウォレット作成時にエラー"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "全額送金データ取得時にエラー"
@@ -1144,16 +1158,16 @@ msgstr "デビットカードの更新エラー"
msgid "Exceeded daily limit of $500 per user"
msgstr "ユーザーの1日当たりの制限 500 米ドルを超えました"
-#: src/js/controllers/confirm.js:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "期限切れ"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "有効期限："
@@ -1196,7 +1210,7 @@ msgstr "エクスポートに失敗しました。"
msgid "Family vacation funds"
msgstr "家族旅行貯金"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "手数料"
@@ -1208,8 +1222,8 @@ msgstr "手数料レベル"
msgid "Fee level is not defined"
msgstr "手数料レベルが定義されていません"
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "手数料:"
@@ -1283,7 +1297,7 @@ msgstr "残高がありました:"
msgid "Funds to be added"
msgstr "追加する資金"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "入金されました"
@@ -1332,16 +1346,16 @@ msgstr "初めての連絡先を追加しましょう。"
msgid "Getting fee levels..."
msgstr "手数料レベルを取得しています…"
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr ""
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr "ギフトカードがもう使用できません。"
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "ギフトカード"
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "期限切れのギフトカード"
@@ -1352,18 +1366,20 @@ msgstr "ギフトカードが利用可能になりました。"
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "戻る"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1392,14 +1408,14 @@ msgstr "ハードウェアウォレット"
#: src/js/controllers/create.js:180
#: src/js/controllers/join.js:145
msgid "Hardware wallets are not yet supported with Bitcoin Cash"
-msgstr ""
+msgstr "ビーキャッシュはまだハードウェアウォレットに対応しておりません。"
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "ヘルプ＆サポート"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "サポートに関する情報はウェブサイトに掲載しております。"
@@ -1478,7 +1494,7 @@ msgstr "このアプリが別の端末に移動されたり、削除されたり
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "自分のビットコインがこの端末に入っていて、外部のサーバー等に保管は一切されていないことを理解しています。"
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "紙に書き留めました"
@@ -1527,7 +1543,7 @@ msgstr "ウォレットをインポート"
msgid "Importing Wallet..."
msgstr "ウォレットインポート中…"
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "ウォレットのバックアップを確認するためには、復元フレーズ用のパスワードをご入力下さい。"
@@ -1536,10 +1552,10 @@ msgstr "ウォレットのバックアップを確認するためには、復元
msgid "Inactive"
msgstr "非アクティブ"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "未完成"
@@ -1561,7 +1577,7 @@ msgid "Incorrect network address"
msgstr "サーバーのアドレスが不正です"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "残高不足"
@@ -1572,6 +1588,10 @@ msgstr "残高不足"
msgid "Insufficient funds for fee"
msgstr "手数料付けるには残高が足りません"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr "連携"
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "無効"
@@ -1615,7 +1635,7 @@ msgstr "請求有効期限切れ"
msgid "Is there anything we could do better?"
msgstr "もっと頑張って欲しいところはありますか？"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "正しいですか？"
@@ -1665,13 +1685,14 @@ msgstr "言語設定"
msgid "Last Month"
msgstr "先月"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
-msgstr ""
+msgstr "詳細情報"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "復元フレーズを確認しましょう。"
@@ -1743,8 +1764,8 @@ msgstr "まあまあです"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "メモ"
@@ -1756,7 +1777,7 @@ msgstr "Mercado Livre Brazil ギフトカード"
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr "Mercadolibre Gift Card Service は現在ご利用できません、また後でお試しください"
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "お店からのメッセージ："
@@ -1764,7 +1785,7 @@ msgstr "お店からのメッセージ："
#: www/views/buyMercadoLibre.html:54
#: www/views/topup.html:63
msgid "Miner Fee"
-msgstr ""
+msgstr "ネットワーク手数料"
#: src/js/services/bwcError.js:134
msgid "Missing parameter"
@@ -1807,7 +1828,7 @@ msgstr "名前"
#: www/views/buyMercadoLibre.html:48
#: www/views/topup.html:56
msgid "Network Cost"
-msgstr ""
+msgstr "ネットワーク手数料"
#: src/js/services/bwcError.js:47
msgid "Network error"
@@ -1890,17 +1911,21 @@ msgstr "ウォレットが選択されていません"
msgid "No wallets available"
msgstr "利用可能なウォレットがありません"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "ペーパーウォレットの出金を受け取るためのウォレットが入っていません。"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
-msgstr ""
+msgstr "ビーキャッシュ対応できるウォレットがありません。"
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr "非 BIP44 ウォレット"
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
-msgstr ""
+msgstr "非対応ビットコインウォレット"
#: src/js/services/feeService.js:12
msgid "Normal"
@@ -1910,7 +1935,7 @@ msgstr "通常"
msgid "Not authorized"
msgstr "権限がありません。"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "手数料含めたら残高が不足しています。"
@@ -1931,6 +1956,10 @@ msgstr "今はしない"
msgid "Note"
msgstr "メモ"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr "注意: このビーキャッシュウォレットがビットコインウォレットからの複製の場合、復元フレーズは一緒です。"
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "注意： ビットコインの売却は 1-of-1 (単一署名) のウォレットからしか行えません。"
@@ -1944,7 +1973,7 @@ msgstr "通知設定"
msgid "Notifications by email"
msgstr "メール通知"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "取引承認時に通知"
@@ -1995,9 +2024,10 @@ msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr "この画面では、全てのウォレット、アカウント、資産が閲覧できます。"
#: src/js/controllers/bitpayCard.js:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "開く"
@@ -2033,7 +2063,11 @@ msgstr "サイトを開く"
#: src/js/controllers/preferencesCash.js:32
msgid "Open bitcoincash.org?"
-msgstr ""
+msgstr "ビーキャッシュの宣伝サイト開きますか？"
+
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr "復元ツールを開く"
#: www/views/tab-receive.html:27
msgid "Open wallet"
@@ -2117,7 +2151,7 @@ msgid "Payment Rejected"
msgstr "送金が却下されました"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,9 +2167,9 @@ msgstr "取引が承認されました。Glideraより送信されます。問
#: src/js/services/incomingData.js:152
msgid "Payment address was translated to new Bitcoin Cash address format:"
-msgstr ""
+msgstr "支払先アドレスはビーキャッシュの新フォーマットに変更された:"
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "支払いの詳細"
@@ -2156,11 +2190,11 @@ msgstr "保留中の提案"
msgid "Permanently delete this wallet."
msgstr "ウォレットを完全に削除する"
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "個人用ウォレット"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "丁寧に復元フレーズを紙に書き留めて下さい"
@@ -2168,7 +2202,7 @@ msgstr "丁寧に復元フレーズを紙に書き留めて下さい"
msgid "Please connect a camera to get started."
msgstr "始めるためにカメラを接続して下さい。"
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "復元フレーズをご入力下さい"
@@ -2181,7 +2215,7 @@ msgstr "復元フレーズをご入力下さい"
msgid "Please enter your PIN"
msgstr "PIN コードを入力してください。"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "正しい順序で各単語をタップしてください。"
@@ -2192,7 +2226,7 @@ msgstr "この操作を実行するにはCopayを最新バージョンに更新
#: www/views/walletDetails.html:142
#: www/views/walletDetails.html:62
msgid "Please wait"
-msgstr ""
+msgstr "お待ちください"
#: src/js/controllers/import.js:238
msgid "Please, select your backup file"
@@ -2214,7 +2248,7 @@ msgstr "アドレスを処理中…"
msgid "Preparing backup..."
msgstr "バックアップを準備中..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "もう一度押して終了"
@@ -2240,7 +2274,7 @@ msgstr "提案が承諾されました"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "提案が作成されました"
@@ -2300,14 +2334,18 @@ msgstr "もっと読む"
#: src/js/controllers/preferences.js:65
#: src/js/controllers/tx-details.js:54
msgid "Read more in our Wiki"
-msgstr ""
+msgstr "詳しくはwikiでお読みください"
+
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr "閲覧専用ウォレット"
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "受取"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr "通貨"
@@ -2465,17 +2503,17 @@ msgstr "もう一度スキャンし直してください。"
msgid "Scan your fingerprint please"
msgstr "指紋をスキャンしてください"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
-msgstr ""
+msgstr "ウォレットの中にビーキャッシュが無いか確認する"
#: src/js/services/onGoingProcess.js:30
msgid "Scanning Wallet funds..."
msgstr "ウォレット残高照会中…"
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
-msgstr ""
+msgstr "確認中…"
#: www/views/includes/screenshotWarningModal.html:7
msgid "Screenshots are not secure"
@@ -2546,7 +2584,7 @@ msgstr "ビットコインアドレスをメールにて共有"
msgid "Send by email"
msgstr "メールで送信"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "ここから送金"
@@ -2585,7 +2623,7 @@ msgstr "全残高を送金"
msgid "Sending transaction"
msgstr "取引送信中"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "ウォレット {{name}} から {{amountStr}} の送金を行います。"
@@ -2702,24 +2740,27 @@ msgstr "単一アドレスウォレット"
msgid "Skip"
msgstr "スキップ"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
-msgstr ""
+msgstr "スライドして承諾"
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "スライドして購入"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
-msgstr ""
+msgstr "スライドして支払う"
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
-msgstr ""
+msgstr "スライドして送る"
+
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr "いくつかのウォレットがビーキャッシュに対応できません。ビーキャッシュの取り戻しは復元ツールで試すとうまくいくかもしれません。"
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
@@ -2765,7 +2806,7 @@ msgstr "超節約"
#: www/views/preferencesCash.html:11
msgid "Support Bitcoin Cash"
-msgstr ""
+msgstr "ビーキャッシュ対応"
#: www/views/paperWallet.html:7
msgid "Sweep"
@@ -2795,7 +2836,7 @@ msgstr "長押しで表示"
#: www/views/includes/walletInfo.html:3
msgid "Tap to recreate"
-msgstr ""
+msgstr "タップして再構築"
#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
@@ -2940,7 +2981,7 @@ msgstr "このアプリは素晴らしいです!"
msgid "This app stores your bitcoin with cutting-edge security."
msgstr "このアプリは、最先端のセキュリティであなたのビットコインをお守りします。"
-#: src/js/controllers/confirm.js:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "ビットコインペイメントの請求期限が切れています。"
@@ -2950,15 +2991,15 @@ msgstr "ビットコインペイメントの請求期限が切れています。
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "このパスワードは復元できません。リセットすることができません。弊社のサーバーで管理するものではありません。復元フレーズとセットで必ず書き留めておいて下さい。復元フレーズとこのパスワードのどれかを忘れてしまうと、ビットコインを復元することができません。ご注意下さい。"
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "この復元フレーズにパスワードがかかっています。このウォレットを復元するためには、復元フレーズに加え、パスワードも必要です。"
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr "この取引の金額はビットコインネットワーク手数料より低いです。送金額より大きい手数料を払ってしまうことになります。"
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "この取引は承認されるまで非常に時間のかかる可能性があります。承認されずにネットワークに捨てられてしまう危険性もありますので、承認されるまでお待ちいただくことを強くおすすめします。"
@@ -2967,14 +3008,14 @@ msgstr "この取引は承認されるまで非常に時間のかかる可能性
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "現在設定中のBitcore Wallet Service (BWS) サーバーにて、このウォレットの登録がありません。再登録を行うこともできます。"
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "履歴"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3029,7 +3070,7 @@ msgstr "Touch ID が失敗しました。"
msgid "Transaction"
msgstr "取引"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "取引情報を作成しました"
@@ -3089,7 +3130,7 @@ msgstr "復元フレーズの単語 (通常 12 個) を入力して下さい。"
msgid "Uh oh..."
msgstr "あら…"
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "未承認"
@@ -3163,7 +3204,7 @@ msgstr "Insightにて取引を表示"
msgid "View Update"
msgstr "更新情報を表示"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "ブロックチェーンで詳細を閲覧"
@@ -3283,7 +3324,7 @@ msgstr "ウォレットタイプ"
msgid "Wallet already exists"
msgstr "既存のウォレットです"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr "{{appName}}内の既存のウォレットです"
@@ -3325,8 +3366,8 @@ msgstr "ウォレットがバックアップされていません"
msgid "Wallet not found"
msgstr "ウォレットが見つかりません。"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "ウォレットが未登録"
@@ -3334,9 +3375,9 @@ msgstr "ウォレットが未登録"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "このウォレットは Wallet Service にて登録されていません。再び「新規作成」メニューから詳細設定を選び、復元フレーズをご入力下さい。"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "ウォレットの復元フレーズが削除されているため表示できません。"
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr "ウォレットの復元フレーズが削除されているため表示できません"
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3346,11 +3387,7 @@ msgstr "Wallet serviceが見つかりません。"
msgid "Wallets"
msgstr "ウォレット"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "ウォレットと連動"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3371,7 +3408,7 @@ msgstr "注意して下さい！"
msgid "We'd love to do better."
msgstr "サービスを改善していきます"
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "次の画面で確認作業を行います。"
@@ -3415,7 +3452,7 @@ msgstr "アプリケーションストアにレビューを書いてみません
msgid "Would you like to receive push notifications about payments?"
msgstr "送金発生時にプッシュ通知を受け取りますか?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "単語の数が間違っています："
@@ -3451,7 +3488,7 @@ msgstr "GitHubのページにて最近の開発動向を見たり、改善案の
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "世界中のECサイトや店舗でビットコインを使って支払いができます。"
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "バックアップファイルの作成は「上級者向け」⇒「エクスポート」からアクセスできます。"
@@ -3529,10 +3566,10 @@ msgstr "ウォレットは一度もクラウドへ保存されたりすること
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "ウォレットの鍵が暗号化されます。Copayでは送金時のパスワードをリセットしてくれる機能がありませんので、パスワードを忘れないよう、控えておいて下さい。"
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3541,7 +3578,7 @@ msgstr "[残高非表示中]"
#: www/views/walletDetails.html:141
#: www/views/walletDetails.html:61
msgid "[Scanning Funds]"
-msgstr ""
+msgstr "[確認中]"
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
@@ -3551,7 +3588,7 @@ msgstr "BitPay VISAカードを追加します"
msgid "locked by pending payments"
msgstr "未対応送金の提案によりロック中"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "自分"
@@ -3563,6 +3600,10 @@ msgstr "name@example.com"
msgid "preparing..."
msgstr "準備中..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr "復元ツールはこちら"
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} を Amazon.com ギフトカードに"
@@ -3575,11 +3616,11 @@ msgstr "{{amountStr}} を Mercado Livre Brazil ギフトカードに"
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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} のビットコインネットワーク手数料が差し引かれます。"
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "送金額に対する {{tx.txp[wallet.id].feeRatePerStr}}"
@@ -3587,7 +3628,7 @@ msgstr "送金額に対する {{tx.txp[wallet.id].feeRatePerStr}}"
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} 個の取引ダウンロード済み"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 63e93bc00..f8fdbd712 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Last-Translator: cmgustavo83\n"
"Language-Team: Dutch\n"
"Language: nl\n"
-"PO-Revision-Date: 2017-09-20 16:53-0400\n"
+"PO-Revision-Date: 2017-10-10 08:58-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(Vertrouwd)"
msgid "(possible double spend)"
msgstr "(mogelijk dubbel besteed)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Een bestedingsvoorstel kan worden verwijderd als 1) u de aanmaker bent, en geen andere copayer deze heeft ondertekend, of 2) 24 uur zijn verstreken sinds het voorstel werd aangemaakt."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "- {{btx.feeRateStr}} van de transactie"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "- {{tx.feeRateStr}} van de transactie"
@@ -48,16 +48,16 @@ msgstr "Alleen inwisselbaar op Mercado Livre (Brazilië)"
msgid "A member of the team will review your feedback as soon as possible."
msgstr "Een lid van het team zal zo spoedig mogelijk uw feedback bekijken."
-#: src/js/controllers/confirm.js:380
+#: src/js/controllers/confirm.js:401
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "Een totaal van {{amountAboveMaxSizeStr}} is uitgesloten. De maximum toegestane grootte voor een transactie is overschreden."
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:395
msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided."
msgstr "Een totaal van {{amountBelowFeeStr}} is uitgesloten. Dit saldo is afkomstig uit ontvangsten kleiner dan de transactiekosten."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "Over"
@@ -102,7 +102,7 @@ msgstr "Contactpersoon Toevoegen"
msgid "Add Funds"
msgstr "Saldo Toevoegen"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Notitie Toevoegen"
@@ -126,7 +126,7 @@ msgstr "Een optioneel wachtwoord toevoegen voor het beveiligen van de herstel zi
msgid "Add as a contact"
msgstr "Toevoegen als contactpersoon"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Beschrijving toevoegen"
@@ -161,7 +161,7 @@ msgstr "Adres Type"
msgid "Addresses With Balance"
msgstr "Adressen Met Saldo"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Geavanceerd"
@@ -216,7 +216,7 @@ msgstr "Bedrag"
msgid "Amount below minimum allowed"
msgstr "Bedrag lager dan minimum toegestaan"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Bedrag te groot"
@@ -248,7 +248,7 @@ msgstr "Kijkt er iemand mee? Iedereen die uw herstel zin weet heeft toegang tot
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "Weet u zeker dat u wilt annuleren en deze portemonnee verwijderen?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "Weet u zeker dat u deze contactpersoon wilt verwijderen?"
@@ -301,9 +301,9 @@ msgstr "Gemiddelde bevestigingstijd"
msgid "BIP32 path for address derivation"
msgstr "BIP32 pad voor adres derivatie"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
-msgstr "BTC-portemonnees"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
+msgstr "BTC portemonnees"
#: www/views/preferences.html:34
msgid "Backup"
@@ -317,8 +317,9 @@ msgstr "Backup Nodig"
msgid "Backup all livenet wallets before using this function"
msgstr "Maak een backup van alle livenet portemonnees voordat u deze functie gebruikt"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Backup nodig"
@@ -335,7 +336,7 @@ msgstr "Backup van portemonnee maken"
msgid "Backup your wallet before using this function"
msgstr "Maak een backup van uw portemonnee voordat u deze functie gebruikt"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Foutieve portemonnee-uitnodiging"
@@ -358,22 +359,32 @@ msgstr "Bitcoin Adres"
#: www/views/cashScan.html:4
msgid "Bitcoin Cash (BCH) Balances"
-msgstr ""
+msgstr "Bitcoin Cash (BCH) Saldo's"
#: www/views/preferencesCash.html:3
#: www/views/tab-settings.html:47
msgid "Bitcoin Cash Support"
msgstr "Ondersteuning voor Bitcoin Cash"
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr "Bitcoin Cash Portemonnees"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
-msgstr "Bitcoin Netwerk Transactiekosten Beleid"
+msgstr "Transactiekostenbeleid Bitcoin-netwerk"
+
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr "Bitcoin Portemonnees"
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
-msgstr ""
+msgstr "Bitcoin cash Betaling"
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -444,7 +455,7 @@ msgstr "Transactiekosten berekenen"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "Uitnodiging annuleren"
msgid "Cannot Create Wallet"
msgstr "Kan Portemonnee Niet Aanmaken"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "Kan niet meerdere keren tegelijk deelnemen aan een portemonnee"
@@ -497,7 +508,7 @@ msgstr "Kies uw doel portemonnee"
msgid "Choose your source wallet"
msgstr "Kies uw bron portemonnee"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Leegmaken"
@@ -505,16 +516,16 @@ msgstr "Leegmaken"
msgid "Clear cache"
msgstr "Cache legen"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
msgstr "Klik om te accepteren"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
msgstr "Klik om te betalen"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
msgstr "Klik om te verzenden"
@@ -532,7 +543,7 @@ msgstr "Sluiten"
#: www/views/includes/cash.html:2
#: www/views/preferencesInformation.html:17
msgid "Coin"
-msgstr "Munt"
+msgstr "Valuta"
#: www/views/preferences.html:22
msgid "Color"
@@ -552,11 +563,11 @@ msgstr "Voltooid"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Bevestigen & Voltooien"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "Bevestig aankoop"
@@ -580,7 +590,7 @@ msgstr "Bevestig uw PIN"
msgid "Confirm your new spending password"
msgstr "Bevestig uw nieuwe bestedingswachtwoord"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Bevestigingen"
@@ -617,6 +627,10 @@ msgstr "Ga verder"
msgid "Contribute Translations"
msgstr "Bijdragen aan Vertalingen"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr "Copay ondersteunt Bitcoin Cash alleen met gebruik van nieuwe versienummer adressen"
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Copayer reeds in deze portemonnee"
@@ -667,11 +681,11 @@ msgstr "Kon geen toegang krijgen tot de portemonnee op de server. Graag dit chec
msgid "Could not access to Amazon.com"
msgstr "Kon geen verbinding maken met Amazon.com"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "Kon geen toegang krijgen tot portemonnee"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Kon geen bericht toegevoegd worden aan geïmporteerde portemonnee zonder gedeelde sleutel"
@@ -697,15 +711,15 @@ msgstr "Kon factuur niet aanmaken"
msgid "Could not create transaction"
msgstr "Kon transactie niet aanmaken"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "Kon niet aanmaken met de gebruikte verlengde privé sleutel"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "Kon niet aanmaken met de opgegeven verlengde publieke sleutel"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Kon niet worden gemaakt: Ongeldige portemonnee herstel zin"
@@ -717,7 +731,7 @@ msgstr "Kon bestand niet ontsleutelen, check uw wachtwoord"
msgid "Could not delete payment proposal"
msgstr "Kon betalingsvoorstel niet verwijderen"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
msgstr "Kon niet dupliceren"
@@ -743,17 +757,17 @@ msgstr "Kon factuur niet opvragen"
msgid "Could not get transactions"
msgstr "Kon transacties niet opvragen"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "Kon niet importeren"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "Kon niet importeren. Controleer bestand en bestedingswachtwoord"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "Kon niet toetreden tot portemonnee"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Gedeelde Portemonnee Aanmaken"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Bitcoin portemonnee aanmaken"
@@ -821,8 +835,8 @@ msgstr "Gedeelde portemonnee aanmaken"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "{{formData.requiredCopayers}}-van-{{formData.totalCopayers}} portemonnee aanmaken"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Aangemaakt door"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr "Aangepaste Transactiekosten"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Datum"
@@ -861,14 +875,14 @@ msgstr "Datum"
msgid "Delete"
msgstr "Verwijderen"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Verwijder Bestedingsvoorstel"
#: www/views/preferencesAdvanced.html:33
#: www/views/preferencesDeleteWallet.html:3
msgid "Delete Wallet"
-msgstr "Portemonnee Verwijderen"
+msgstr "Portemonnee verwijderen"
#: www/views/copayers.html:59
msgid "Delete it and create a new one"
@@ -891,7 +905,7 @@ msgstr "Derivatie Pad"
#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
-msgstr "Derivatie Strategie"
+msgstr "Derivatiestrategie"
#: www/views/buyAmazon.html:39
#: www/views/buyMercadoLibre.html:38
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "Details"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Uitgeschakeld"
@@ -924,7 +938,7 @@ msgstr "Ziet u uw taal niet op Crowdin? Neem contact op met de Eigenaar op Crowd
msgid "Download"
msgstr "Download"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr "Dupliceren voor BCH"
@@ -1012,14 +1026,14 @@ msgstr "Vul de herstel zin in (BIP39)"
msgid "Enter your email"
msgstr "Vul uw email in"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Voer uw wachtwoord in"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Voer uw wachtwoord in"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Voer uw wachtwoord in"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Voer uw wachtwoord in"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Voer uw wachtwoord in"
msgid "Error"
msgstr "Fout"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Fout bij bevestigen"
@@ -1108,11 +1122,11 @@ msgstr "Fout tijdens maken cadeaubon"
msgid "Error creating the invoice"
msgstr "Fout tijdens maken van de factuur"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Fout tijdens maken portemonnee"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "Fout tijdens opvragen VerstuurMaximum informatie"
@@ -1142,22 +1156,22 @@ msgstr "Fout tijdens bijwerken Debet Kaarten"
msgid "Exceeded daily limit of $500 per user"
msgstr "Dagelijkse limiet van $500 per gebruiker overschreden"
-#: src/js/controllers/confirm.js:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Verlopen"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "Verloopt"
#: www/views/preferencesAdvanced.html:21
msgid "Export Wallet"
-msgstr "Exporteer Portemonnee"
+msgstr "Portemonnee exporteren"
#: www/views/preferencesHistory.html:11
#: www/views/preferencesHistory.html:14
@@ -1194,7 +1208,7 @@ msgstr "Exporteren mislukt"
msgid "Family vacation funds"
msgstr "Familie vakantie fonds"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Transactiekosten"
@@ -1206,8 +1220,8 @@ msgstr "Niveau transactiekosten"
msgid "Fee level is not defined"
msgstr "Niveau transactiekosten is niet ingesteld"
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "Transactiekosten:"
@@ -1281,7 +1295,7 @@ msgstr "Gevonden saldo:"
msgid "Funds to be added"
msgstr "Saldo toe te voegen"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Overgemaakt saldo"
@@ -1330,16 +1344,16 @@ msgstr "Ga aan de slag door uw eerste toe te voegen."
msgid "Getting fee levels..."
msgstr "Hoogte transactiekosten opvragen..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr "Cadeaubon"
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr "Cadeaukaart is niet meer beschikbaar voor gebruik"
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "Cadeaubon"
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "Cadeaubon verlopen"
@@ -1350,18 +1364,20 @@ msgstr "Cadeaubon aangemaakt en klaar voor gebruik."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Terug"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1390,14 +1406,14 @@ msgstr "Hardware portemonnee"
#: src/js/controllers/create.js:180
#: src/js/controllers/join.js:145
msgid "Hardware wallets are not yet supported with Bitcoin Cash"
-msgstr "Hardwareportemonnees worden nog niet ondersteund voor Bitcoin Cash"
+msgstr "Hardware portemonnees worden nog niet ondersteund bij Bitcoin Cash"
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Hulp & Ondersteuning"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "Hulp en ondersteuning is beschikbaar op de website."
@@ -1476,7 +1492,7 @@ msgstr "Ik begrijp dat als deze app wordt verwijderd of verplaatst naar een ande
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Ik begrijp dat mijn saldo veilig op dit apparaat bewaard wordt, en niet in handen is van een bedrijf."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "Ik heb het opgeschreven"
@@ -1511,7 +1527,7 @@ msgstr "Importeren"
#: www/views/import.html:3
msgid "Import Wallet"
-msgstr "Importeer Portemonnee"
+msgstr "Portemonnee importeren"
#: www/views/tab-import-file.html:41
msgid "Import backup"
@@ -1525,7 +1541,7 @@ msgstr "Importeer portemonnee"
msgid "Importing Wallet..."
msgstr "Portemonnee importeren..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "Vul uw wachtwoord in om de backup van uw portemonnee te verifiëren."
@@ -1534,10 +1550,10 @@ msgstr "Vul uw wachtwoord in om de backup van uw portemonnee te verifiëren."
msgid "Inactive"
msgstr "Inactief"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Onvolledig"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr "Onjuist netwerk adres"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Onvoldoende saldo"
@@ -1570,6 +1586,10 @@ msgstr "Onvoldoende saldo"
msgid "Insufficient funds for fee"
msgstr "Onvoldoende saldo voor transactiekosten"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr "Integraties"
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Ongeldig"
@@ -1613,7 +1633,7 @@ msgstr "Factuur verlopen"
msgid "Is there anything we could do better?"
msgstr "Is er iets dat we beter kunnen doen?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "Klopt dit?"
@@ -1663,13 +1683,14 @@ msgstr "Taal"
msgid "Last Month"
msgstr "Vorige Maand"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
msgstr "Meer informatie"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Laten we de backup zin verifiëren."
@@ -1741,8 +1762,8 @@ msgstr "Meh - het is OK"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Notitie"
@@ -1754,7 +1775,7 @@ msgstr "Mercado Livre Brazil Cadeaubonnen"
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr "Mercadolibre Cadeaubon Service is niet beschikbaar op dit moment. Probeer het later nog eens."
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Bericht Verkoper"
@@ -1888,15 +1909,19 @@ msgstr "Geen portemonnee geselecteerd"
msgid "No wallets available"
msgstr "Geen portemonnees beschikbaar"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "Geen portemonnees beschikbaar om saldo te ontvangen"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
-msgstr "Geen geschikte portemonnees voor Bitcoin Cash-ondersteuning"
+msgstr "Geen geschikte portemonnees voor Bitcoin Cash ondersteuning"
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr "Niet-BIP44 portemonnee"
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr "Geen geschikte BTC-portemonnees"
@@ -1908,7 +1933,7 @@ msgstr "Normaal"
msgid "Not authorized"
msgstr "Niet geautoriseerd"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "Onvoldoende saldo voor transactiekosten"
@@ -1929,6 +1954,10 @@ msgstr "Niet nu"
msgid "Note"
msgstr "Notitie"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr "Let op: als deze BCH portemonnee is gedupliceerd van een BTC portemonnee, dan delen zij de zelfde herstel zin."
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Let op: alleen 1-1 (enkele ondertekening) portemonnees kunnen gebruikt worden voor het verkopen van bitcoin"
@@ -1942,7 +1971,7 @@ msgstr "Meldingen"
msgid "Notifications by email"
msgstr "Meldingen per email"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "Geef mij een melding wanneer bevestigd"
@@ -1993,9 +2022,10 @@ msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr "Op dit scherm ziet u al uw portemonnees, accounts en eigendommen."
#: src/js/controllers/bitpayCard.js:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Openen"
@@ -2033,6 +2063,10 @@ msgstr "Website Openen"
msgid "Open bitcoincash.org?"
msgstr "Bitcoincash.org openen?"
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr "Open de herstel tool."
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Portemonnee openen"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Betaling Afgewezen"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2131,9 +2165,9 @@ msgstr "Betaling geaccepteerd. Deze zal worden verzonden door Glidera. In geval
#: src/js/services/incomingData.js:152
msgid "Payment address was translated to new Bitcoin Cash address format:"
-msgstr "Betalingsadres is vertaald naar nieuw adresformaat voor Bitcoin Cash:"
+msgstr "Betalingsadres is vertaald naar nieuw adresformat voor Bitcoin Cash:"
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Details Betaling"
@@ -2154,11 +2188,11 @@ msgstr "Voorstellen in behandeling"
msgid "Permanently delete this wallet."
msgstr "Deze portemonnee definitief verwijderen."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Persoonlijke Portemonnee"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Schrijf zorgvuldig deze zin op."
@@ -2166,7 +2200,7 @@ msgstr "Schrijf zorgvuldig deze zin op."
msgid "Please connect a camera to get started."
msgstr "Sluit een camera aan om aan de slag te gaan."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Vul de herstel zin in"
@@ -2179,7 +2213,7 @@ msgstr "Vul de herstel zin van de portemonnee in"
msgid "Please enter your PIN"
msgstr "Vul uw PIN in"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Druk a.u.b. op elk woord in de juiste volgorde."
@@ -2190,7 +2224,7 @@ msgstr "Upgrade Copay om deze actie uit te voeren"
#: www/views/walletDetails.html:142
#: www/views/walletDetails.html:62
msgid "Please wait"
-msgstr "Even geduld"
+msgstr "Een moment geduld a.u.b."
#: src/js/controllers/import.js:238
msgid "Please, select your backup file"
@@ -2212,7 +2246,7 @@ msgstr "Adressen voorbereiden..."
msgid "Preparing backup..."
msgstr "Backup voorbereiden..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Druk nogmaals om te sluiten"
@@ -2238,7 +2272,7 @@ msgstr "Voorstel Geaccepteerd"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Voorstel Aangemaakt"
@@ -2300,12 +2334,16 @@ msgstr "Lees meer"
msgid "Read more in our Wiki"
msgstr "Lees meer in onze Wiki"
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr "Alleen-lezen portemonnee"
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "Ontvangen"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr "Ontvangen in"
@@ -2463,17 +2501,17 @@ msgstr "Scan nogmaals"
msgid "Scan your fingerprint please"
msgstr "Scan uw vingerafdruk"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
-msgstr ""
+msgstr "Scannen naar Bitcoin Cash in uw portemonnees"
#: src/js/services/onGoingProcess.js:30
msgid "Scanning Wallet funds..."
msgstr "Saldo Portemonnee scannen..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
-msgstr ""
+msgstr "Saldo scannen..."
#: www/views/includes/screenshotWarningModal.html:7
msgid "Screenshots are not secure"
@@ -2544,7 +2582,7 @@ msgstr "Verstuur adressen per email"
msgid "Send by email"
msgstr "Verstuur via email"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Verzenden vanuit"
@@ -2583,7 +2621,7 @@ msgstr "Maximale hoeveelheid verzenden"
msgid "Sending transaction"
msgstr "Transactie verzenden"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Verzenden van {{amountStr}} vanuit uw {{name}} portemonnee"
@@ -2698,25 +2736,28 @@ msgstr "Portemonnee met 1 Adres"
msgid "Skip"
msgstr "Overslaan"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr "Schuiven om te accepteren"
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "Schuif om te kopen"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr "Schuiven om te betalen"
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr "Schuiven om te verzenden"
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr "Sommige van uw portemonnees komen niet in aanmerking voor Bitcoin Cash ondersteuning. U kunt proberen toegang te krijgen tot het BCH saldo van deze portemonnees met gebruik van de"
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,7 @@ msgstr "Deze app is fantastisch!"
msgid "This app stores your bitcoin with cutting-edge security."
msgstr "Deze app bewaart uw bitcoin met de nieuwste beveiliging."
-#: src/js/controllers/confirm.js:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Dit bitcoin betalingsverzoek is verlopen."
@@ -2944,15 +2985,15 @@ msgstr "Dit bitcoin betalingsverzoek is verlopen."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "Dit wachtwoord kan niet worden achterhaald. Als het wachtwoord verloren gaat is er geen mogelijkheid om toegang tot uw saldo te herstellen."
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Deze herstel zin is aangemaakt met een wachtwoord. Om deze portemonnee te herstellen heeft u de herstel zin en het wachtwoord nodig."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr "Het bedrag van deze transactie is te klein vergeleken met huidige Bitcoin netwerk transactiekosten. Bij dit bedrag betaald u transactiekosten vergelijkbaar met het bedrag zelf."
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Deze transactie zou lang kunnen wachten op een bevestiging of kan worden geschrapt vanwege de lage transactiekosten die de verzender heeft gekozen"
@@ -2961,14 +3002,14 @@ msgstr "Deze transactie zou lang kunnen wachten op een bevestiging of kan worden
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Deze portemonnee is niet geregistreerd bij de opgegeven Bitcore Wallet Service (BWS). U kunt deze opnieuw aanmaken vanuit de lokale informatie."
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Tijdlijn"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Touch ID Mislukt"
msgid "Transaction"
msgstr "Transactie"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "Transactie Aangemaakt"
@@ -3083,7 +3124,7 @@ msgstr "Vul de Herstel Zin in (meestal 12 woorden)"
msgid "Uh oh..."
msgstr "Oh oh..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Onbevestigd"
@@ -3157,7 +3198,7 @@ msgstr "Bekijk Transactie op Insight"
msgid "View Update"
msgstr "Update Bekijken"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Bekijk op blockchain"
@@ -3277,7 +3318,7 @@ msgstr "Portemonnee Type"
msgid "Wallet already exists"
msgstr "Portemonnee bestaat al"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr "Portemonnee reeds in {{appName}}"
@@ -3319,8 +3360,8 @@ msgstr "Nog geen backup van de portemonnee gemaakt"
msgid "Wallet not found"
msgstr "Portemonnee niet gevonden"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Portemonnee niet geregistreerd"
@@ -3328,9 +3369,9 @@ msgstr "Portemonnee niet geregistreerd"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "Portemonnee niet geregistreerd bij de wallet service. Maak deze opnieuw aan vanuit \"Portemonnee Aanmaken\" en maak gebruik van \"Geavanceerde Opties\" om uw herstel zin in te voeren"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "Portemonnee herstel zin niet beschikbaar."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr "Portemonnee herstel zin niet beschikbaar"
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Wallet service niet gevonden"
msgid "Wallets"
msgstr "Portemonnees"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Portemonnees & Integratie"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "Pas op!"
msgid "We'd love to do better."
msgstr "Wij doen het graag nog beter."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "We bevestigen dit op het volgende scherm."
@@ -3409,7 +3446,7 @@ msgstr "Zou u bereid zijn om {{appName}} te beoordelen in de app store?"
msgid "Would you like to receive push notifications about payments?"
msgstr "Wilt u push meldingen ontvangen over betalingen?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Onjuist aantal herstel woorden:"
@@ -3445,7 +3482,7 @@ msgstr "U kunt de laatste ontwikkelingen volgen en bijdragen aan deze open sourc
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "U kunt met bitcoin betalen bij miljoenen websites en winkels over de hele wereld."
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "U kunt deze nog steeds exporteren vanuit Geavanceerd > Exporteren."
@@ -3523,10 +3560,10 @@ msgstr "Uw portemonnee wordt nooit opgeslagen in de cloud of in standaard appara
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "Uw privé sleutel wordt versleuteld. Het Bestedingswachtwoord kan niet worden achterhaald, schrijf deze zorgvuldig op."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3535,7 +3572,7 @@ msgstr "[Saldo Verborgen]"
#: www/views/walletDetails.html:141
#: www/views/walletDetails.html:61
msgid "[Scanning Funds]"
-msgstr ""
+msgstr "[Saldo Scannen]"
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
@@ -3545,7 +3582,7 @@ msgstr "voeg uw BitPay Visa kaart(en) toe"
msgid "locked by pending payments"
msgstr "vergrendeld door betalingen in behandeling"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "ik"
@@ -3557,6 +3594,10 @@ msgstr "naam@voorbeeld.nl"
msgid "preparing..."
msgstr "voorbereiden..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr "herstel tool."
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} voor Amazon.com Cadeaubon"
@@ -3569,11 +3610,11 @@ msgstr "{{amountStr}} voor Mercado Livre Brazil Cadeaubon"
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}} is afhankelijk van Bitcore Wallet Service (BWS) voor blockchain informatie, netwerk verbinding en Copayer synchronisatie. De standaard instelling wijst naar https://bws.bitpay.com (BitPay's openbare BWS instance)."
-#: src/js/controllers/confirm.js:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} wordt in mindering gebracht voor bitcoin transactiekosten."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} van het te verzenden bedrag"
@@ -3581,7 +3622,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} van het te verzenden bedrag"
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transacties gedownload"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 46616bf00..18d415d48 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-09-19 14:07-0400\n"
+"PO-Revision-Date: 2017-10-09 10:33-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(Zaufany)"
msgid "(possible double spend)"
msgstr "(możliwa podwójna wypłata)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Wniosek wypłaty może być usunięty jeśli: 1) Po utworzeniu nie zatwierdził go żaden inny współwłaściciel portfela lub 2) minęły 24 godziny od kiedy wniosek został utworzony."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "{{btx.feeRateStr}} transakcji"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "{{tx.feeRateStr}} transakcji"
@@ -48,16 +48,16 @@ msgstr ""
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:380
+#: src/js/controllers/confirm.js:401
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:374
+#: src/js/controllers/confirm.js:395
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."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "O programie"
@@ -102,7 +102,7 @@ msgstr "Dodaj kontakt"
msgid "Add Funds"
msgstr "Dodaj środki"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Dodaj notatkę"
@@ -126,7 +126,7 @@ msgstr "Dodaj opcjonalnie hasło w celu zabezpieczenia kluczowej frazy"
msgid "Add as a contact"
msgstr "Dodaj jako kontakt"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Dodaj opis"
@@ -161,7 +161,7 @@ msgstr "Rodzaj adresu"
msgid "Addresses With Balance"
msgstr "Adresy z funduszami"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Zaawansowane"
@@ -216,7 +216,7 @@ msgstr "Kwota"
msgid "Amount below minimum allowed"
msgstr "Kwota poniżej minimum dozwolona"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Zbyt duża kwota"
@@ -248,7 +248,7 @@ msgstr "Czy jesteś obserwowany? Każdy, kto zdobędzie twoją kluczową frazę
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "Czy na pewno chcesz usunąć ten portfel?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "Czy na pewno chcesz usunąć ten kontakt?"
@@ -301,8 +301,8 @@ msgstr "Spodziewany czas potwierdzania"
msgid "BIP32 path for address derivation"
msgstr "BIP32 ścieżka dla adresu derywacji"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
msgstr ""
#: www/views/preferences.html:34
@@ -317,8 +317,9 @@ 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"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Potrzebna kopia zapasowa"
@@ -335,7 +336,7 @@ msgstr "Kopia zapasowa portfela"
msgid "Backup your wallet before using this function"
msgstr "Zrób kopię zapasową portfela przed użyciem tej funkcji"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Nieprawidłowe zaproszenie"
@@ -365,12 +366,22 @@ msgstr ""
msgid "Bitcoin Cash Support"
msgstr ""
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Polityka prowizji sieci bitcoin"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr ""
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
msgstr ""
@@ -428,7 +439,7 @@ msgstr "Kup bitcoiny"
#: www/views/mercadoLibre.html:22
#: www/views/mercadoLibre.html:50
msgid "Buy a Gift Card"
-msgstr ""
+msgstr "Kup kartę podarunkową"
#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
@@ -444,7 +455,7 @@ msgstr "Obliczanie prowizji"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "Anuluj zaproszenie"
msgid "Cannot Create Wallet"
msgstr "Nie można utworzyć portfela"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "Nie można dołączyć tego samego portfela więcej niż raz"
@@ -497,7 +508,7 @@ msgstr "Wybierz swój portfel docelowy"
msgid "Choose your source wallet"
msgstr "Wybierz swój portfel źródłowy"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Wyczyść"
@@ -505,19 +516,19 @@ msgstr "Wyczyść"
msgid "Clear cache"
msgstr "Wyczyść pamięć podręczną"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
-msgstr ""
+msgstr "Kliknij, aby zaakceptować"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
-msgstr ""
+msgstr "Kliknij, aby zapłacić"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
-msgstr ""
+msgstr "Kliknij, aby wysłać"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -532,7 +543,7 @@ msgstr "Zamknij"
#: www/views/includes/cash.html:2
#: www/views/preferencesInformation.html:17
msgid "Coin"
-msgstr ""
+msgstr "Moneta"
#: www/views/preferences.html:22
msgid "Color"
@@ -552,11 +563,11 @@ msgstr "Zakończono"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Potwierdź & zakończenie"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "Potwierdź zakup"
@@ -580,7 +590,7 @@ msgstr "Potwierdź kod PIN"
msgid "Confirm your new spending password"
msgstr "Potwierdź nowe hasło wypłat"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Potwierdzenia"
@@ -617,6 +627,10 @@ msgstr "Dalej"
msgid "Contribute Translations"
msgstr "Wkład do tłumaczenia"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr ""
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Użytkownik jest już w tym portfelu"
@@ -657,7 +671,7 @@ msgstr "Skopiuj do schowka"
#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
-msgstr ""
+msgstr "Nie można uzyskać dostępu do usługi kart podarunkowych"
#: www/views/tab-import-phrase.html:2
msgid "Could not access the wallet at the server. Please check:"
@@ -667,11 +681,11 @@ msgstr "Nie można uzyskać dostępu do portfela na serwerze. Proszę sprawdzić
msgid "Could not access to Amazon.com"
msgstr "Nie może uzyskać dostępu do Amazon.com"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "Nie można uzyskać dostępu do portfela"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
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"
@@ -697,15 +711,15 @@ msgstr "Nie można utworzyć faktury"
msgid "Could not create transaction"
msgstr "Nie można utworzyć transakcji"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "Nie można utworzyć przy użyciu określonego rozszerzonego klucza prywatnego"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "Nie można utworzyć przy użyciu określonego rozszerzonego klucza publicznego"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Nie można utworzyć: niepoprawna kluczowa fraza"
@@ -717,9 +731,9 @@ msgstr "Nie można odszyfrować pliku, sprawdź hasło"
msgid "Could not delete payment proposal"
msgstr "Nie można usunąć wniosku wypłaty"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
-msgstr ""
+msgstr "Nie można powielić"
#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
@@ -743,17 +757,17 @@ msgstr "Nie można pobrać faktury"
msgid "Could not get transactions"
msgstr "Nie można pobrać transakcji"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "Nie można zaimportować"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "Nie można zaimportować. Sprawdź plik wejściowy i hasło"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "Nie można dołączyć portfela"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Utwórz współdzielony portfel"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Utwórz portfel bitcoin"
@@ -821,8 +835,8 @@ msgstr "Utwórz współdzielony portfel"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Utwórz portfel {{formData.requiredCopayers}} z {{formData.totalCopayers}}"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Utworzony przez"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr "Niestandardowa Prowizja"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Data"
@@ -861,7 +875,7 @@ msgstr "Data"
msgid "Delete"
msgstr "Usuń"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Usuń wniosek wypłaty"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "Szczegóły"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Wyłącz"
@@ -924,13 +938,13 @@ msgstr "Nie widzisz swojego języka na Crowdin? Skontaktuj się z właścicielem
msgid "Download"
msgstr "Pobierz"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr ""
#: src/js/services/onGoingProcess.js:49
msgid "Duplicating wallet..."
-msgstr ""
+msgstr "Duplikowanie portfela..."
#: www/views/addresses.html:19
msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment."
@@ -979,7 +993,7 @@ msgstr "Włącz kamerę aby rozpocząć."
#: www/views/tab-settings.html:49
msgid "Enabled"
-msgstr ""
+msgstr "Włączone"
#: src/js/services/walletService.js:1047
#: src/js/services/walletService.js:1062
@@ -992,7 +1006,7 @@ msgstr "Wprowadź podwójne uwierzytelnienie swojego konta BitPay"
#: www/views/amount.html:4
msgid "Enter amount"
-msgstr ""
+msgstr "Wprowadź kwotę"
#: www/views/modals/chooseFeeLevel.html:41
msgid "Enter custom fee"
@@ -1012,14 +1026,14 @@ msgstr "Wprowadź kluczową frazę (BIP39)"
msgid "Enter your email"
msgstr "Wpisz swój adres e-mail"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Wprowadź hasło"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Wprowadź hasło"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Wprowadź hasło"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Wprowadź hasło"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Wprowadź hasło"
msgid "Error"
msgstr "Błąd"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Błąd w potwierdzeniu"
@@ -1106,13 +1120,13 @@ msgstr "Błąd przy tworzeniu karty upominkowej"
#: src/js/controllers/buyAmazon.js:94
#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
-msgstr ""
+msgstr "Wystąpił błąd podczas tworzenia faktury"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Błąd podczas tworzenia portfela"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "Wystąpił błąd podczas uzyskiwania informacji SendMax"
@@ -1142,16 +1156,16 @@ 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:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Wygasł"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "Wygasa"
@@ -1179,7 +1193,7 @@ msgstr "Rozszerzone klucze publiczne"
#: src/js/services/onGoingProcess.js:20
msgid "Extracting Wallet information..."
-msgstr ""
+msgstr "Wyodrębnianie danych z portfela..."
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -1194,7 +1208,7 @@ msgstr "Nie udało się wyeksportować"
msgid "Family vacation funds"
msgstr "Środki na rodzinne wakacje"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Prowizja"
@@ -1206,8 +1220,8 @@ msgstr "Poziom opłaty"
msgid "Fee level is not defined"
msgstr "Poziom opłaty nie jest zdefiniowany"
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "Prowizja:"
@@ -1230,7 +1244,7 @@ msgstr "Plik/Tekst"
#: www/views/preferencesLogs.html:17
msgid "Filter setting"
-msgstr ""
+msgstr "Ustawienie filtra"
#: src/js/services/fingerprintService.js:43
#: src/js/services/fingerprintService.js:48
@@ -1281,7 +1295,7 @@ msgstr "Znaleziono środki:"
msgid "Funds to be added"
msgstr "Środki, które zostaną dodane"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Środki przelewane"
@@ -1316,7 +1330,7 @@ msgstr "Otrzymywanie wiadomości i aktualizacji z BitPay"
#: www/views/onboarding/welcome.html:8
msgctxt "button"
msgid "Get started"
-msgstr ""
+msgstr "Pierwsze kroki"
#: www/views/bitpayCard.html:49
msgid "Get started"
@@ -1330,15 +1344,15 @@ msgstr "Zacznij dodając swój pierwszy kontakt."
msgid "Getting fee levels..."
msgstr "Uzyskiwanie informacji o prowizji..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr ""
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
-msgstr ""
-
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "Karta podarunkowa"
+msgstr "Karta podarunkowa nie jest już dostępna"
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
@@ -1350,18 +1364,20 @@ msgstr "Karta podarunkowa wygenerowana i gotowa do użycia."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Powrót"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1397,7 +1413,7 @@ msgid "Help & Support"
msgstr "Centrum pomocy"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "Informacja o pomocy i wsparciu technicznym jest dostępna na stronie internetowej."
@@ -1476,7 +1492,7 @@ msgstr "Rozumiem, że jeśli aplikacja zostanie przeniesiona na inne urządzenie
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Rozumiem, że moje środki są bezpieczne na tym urządzeniu i nie znajdują się w posiadaniu spółki."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "Zapisałem to"
@@ -1525,19 +1541,19 @@ msgstr "Importuj portfel"
msgid "Importing Wallet..."
msgstr "Importowanie portfela..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "W celu weryfikacji kopii zapasowej portfela wpisz swoje hasło."
#: www/views/mercadoLibreCards.html:24
#: www/views/modals/mercadolibre-card-details.html:29
msgid "Inactive"
-msgstr ""
+msgstr "Nieaktywne"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Nie wszyscy współwłaściciele dołączyli"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr "Nieprawidłowy adres"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Nie ma wystarczającej ilości środków"
@@ -1570,6 +1586,10 @@ msgstr "Nie ma wystarczającej ilości środków"
msgid "Insufficient funds for fee"
msgstr "Niewystarczające środki na prowizję"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr ""
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Nieprawidłowy"
@@ -1607,13 +1627,13 @@ msgstr "Zaproszenie do współdzielenia portfela {{appName}}"
#: www/views/mercadoLibreCards.html:20
#: www/views/modals/mercadolibre-card-details.html:48
msgid "Invoice expired"
-msgstr ""
+msgstr "Faktura wygasła"
#: src/js/controllers/feedback/send.js:79
msgid "Is there anything we could do better?"
msgstr "Czy jest coś, co możemy poprawić?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "Czy dane są poprawne?"
@@ -1663,13 +1683,14 @@ msgstr "Język"
msgid "Last Month"
msgstr "Zeszły miesiąc"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
-msgstr ""
+msgstr "Dowiedz się więcej"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Sprawdź swoją kluczową frazę."
@@ -1708,7 +1729,7 @@ msgstr "Skuteczna blokada. Proszę czekać, aby usunąć wniosek wypłaty"
#: www/views/includes/logOptions.html:3
msgid "Log options"
-msgstr ""
+msgstr "Opcje dziennika"
#: www/views/modals/bitpay-card-confirmation.html:14
msgid "Log out"
@@ -1741,8 +1762,8 @@ msgstr "Spoko - może być"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Notatka"
@@ -1754,7 +1775,7 @@ msgstr ""
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr ""
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Wiadomość handlowa"
@@ -1846,7 +1867,7 @@ msgstr "Brak kontaktów"
#: www/views/preferencesLogs.html:16
msgid "No entries for this log level"
-msgstr ""
+msgstr "Brak wpisów dla tego poziomu dziennika"
#: www/views/preferencesExternal.html:12
msgid "No hardware information available."
@@ -1888,15 +1909,19 @@ msgstr "Nie wybrano portfela"
msgid "No wallets available"
msgstr "Brak dostępnych portfeli"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "Brak portfeli do otrzymania środków"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
msgstr ""
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr ""
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr ""
@@ -1908,7 +1933,7 @@ msgstr "Zwykła"
msgid "Not authorized"
msgstr "Brak autoryzacji"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "Brak środków na opłacenie prowizji"
@@ -1929,6 +1954,10 @@ msgstr "Nie teraz"
msgid "Note"
msgstr "Notatka"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr ""
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Uwaga: tylko 1-1 portfela (pojedynczy podpis) może być wykorzystywany do sprzedaży bitcoinów"
@@ -1942,7 +1971,7 @@ msgstr "Powiadomienia"
msgid "Notifications by email"
msgstr "Powiadomienia e-mail"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "Powiadom mnie, jeśli potwierdzono"
@@ -1986,16 +2015,17 @@ msgstr "O nie!"
#: src/js/controllers/buyMercadoLibre.js:306
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#: www/views/tab-home.html:39
msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr "Na tym ekranie można zobaczyć wszystkie swoje portfele, konta i środki."
#: src/js/controllers/bitpayCard.js:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Otwórz"
@@ -2031,6 +2061,10 @@ msgstr "Otwórz stronę internetową"
#: src/js/controllers/preferencesCash.js:32
msgid "Open bitcoincash.org?"
+msgstr "Otworzyć bitcoincash.org?"
+
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
msgstr ""
#: www/views/tab-receive.html:27
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Wypłata odrzucona"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,7 +2167,7 @@ msgstr "Wypłata zaakceptowana. Będzie nadana przez Glidera. W przypadku wystą
msgid "Payment address was translated to new Bitcoin Cash address format:"
msgstr ""
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Szczegóły wypłaty"
@@ -2144,7 +2178,7 @@ msgstr "Wniosek o płatność"
#: www/views/mercadoLibreCards.html:22
#: www/views/modals/mercadolibre-card-details.html:39
msgid "Pending"
-msgstr ""
+msgstr "Oczekiwanie"
#: www/views/proposals.html:4
msgid "Pending Proposals"
@@ -2154,11 +2188,11 @@ msgstr "Rozpatrywane płatności"
msgid "Permanently delete this wallet."
msgstr "Trwale usuń portfel."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Portfel osobisty"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Proszę dokładnie zanotować tę kluczową frazę."
@@ -2166,7 +2200,7 @@ msgstr "Proszę dokładnie zanotować tę kluczową frazę."
msgid "Please connect a camera to get started."
msgstr "Proszę podłączyć kamerę, aby zacząć."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Wpisz kluczową frazę"
@@ -2179,7 +2213,7 @@ msgstr "Wpisz kluczową frazę portfela"
msgid "Please enter your PIN"
msgstr "Wprowadź kod PIN"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Proszę wpisać każde słowo we właściwej kolejności."
@@ -2190,7 +2224,7 @@ msgstr "Proszę uaktualnić Copay, by móc wykonać tę operację"
#: www/views/walletDetails.html:142
#: www/views/walletDetails.html:62
msgid "Please wait"
-msgstr ""
+msgstr "Czekaj"
#: src/js/controllers/import.js:238
msgid "Please, select your backup file"
@@ -2212,7 +2246,7 @@ msgstr "Przygotowywanie adresów..."
msgid "Preparing backup..."
msgstr "Przygotowywanie kopii zapasowej..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Naciśnij ponownie, aby wyjść"
@@ -2238,7 +2272,7 @@ msgstr "Płatność przyjęta"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Płatność utworzona"
@@ -2256,11 +2290,11 @@ msgstr "Proponowane płatności"
#: src/js/controllers/buyAmazon.js:282
msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day"
-msgstr ""
+msgstr "Kwota zakupu jest ograniczona do {{limitPerDay}} {{currency}} dziennie"
#: src/js/controllers/buyMercadoLibre.js:281
msgid "Purchase amount must be a value between 50 and 2000"
-msgstr ""
+msgstr "Kwota zakupu musi być wartością z przedziału od 50 do 2000"
#: www/views/onboarding/notifications.html:3
msgid "Push Notifications"
@@ -2298,6 +2332,10 @@ msgstr "Zobacz więcej"
#: src/js/controllers/preferences.js:65
#: src/js/controllers/tx-details.js:54
msgid "Read more in our Wiki"
+msgstr "Więcej informacji w naszej Wiki"
+
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
msgstr ""
#: www/views/tab-receive.html:3
@@ -2305,7 +2343,7 @@ msgstr ""
msgid "Receive"
msgstr "Otrzymaj"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr ""
@@ -2356,7 +2394,7 @@ msgstr "Przywracanie portfela..."
#: www/views/modals/mercadolibre-card-details.html:22
msgid "Redeem now"
-msgstr ""
+msgstr "Zrealizuj teraz"
#: src/js/controllers/modals/txpDetails.js:63
#: src/js/controllers/tx-details.js:80
@@ -2463,7 +2501,7 @@ msgstr "Skanuj ponownie"
msgid "Scan your fingerprint please"
msgstr "Proszę zeskanować linie papilarne"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
msgstr ""
@@ -2471,9 +2509,9 @@ msgstr ""
msgid "Scanning Wallet funds..."
msgstr "Skanowanie środków portfela..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
-msgstr ""
+msgstr "Skanowanie środków portfela..."
#: www/views/includes/screenshotWarningModal.html:7
msgid "Screenshots are not secure"
@@ -2544,7 +2582,7 @@ msgstr "Wyślij adresy przez e-mail"
msgid "Send by email"
msgstr "Wyślij przez e-mail"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Wyślij z"
@@ -2583,7 +2621,7 @@ msgstr "Wysyłanie całej kwoty"
msgid "Sending transaction"
msgstr "Wysyłanie transakcji"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Wysyłanie {{amountStr}} z twojego portfela {{name}}"
@@ -2698,25 +2736,28 @@ msgstr "Pojedynczy adres portfela"
msgid "Skip"
msgstr "Pomiń"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr ""
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "Przesuń, aby kupić"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr ""
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr ""
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr ""
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,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:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Ten wniosek płatności wygasł."
@@ -2944,15 +2985,15 @@ msgstr "Ten wniosek płatności wygasł."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "To hasło nie może zostać odzyskane. Jeśli je utracisz, nie będziesz mógł odzyskać swoich środków."
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Ta kluczowa fraza został utworzona przy użyciu hasła. Aby odzyskać portfel potrzebna jest kluczowa fraza i hasło."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr ""
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Potwierdzenie transakcja może trwać długo lub zostać przerwane z powodu niskiej prowizji ustalonej przez nadawcę"
@@ -2961,14 +3002,14 @@ msgstr "Potwierdzenie transakcja może trwać długo lub zostać przerwane z pow
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Ten portfel nie jest zarejestrowany na Bitcore Wallet Service (BWS). Możesz go odtworzyć z lokalnego nośnika."
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Historia"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Odczyt Touch ID nie powiódł się"
msgid "Transaction"
msgstr "Transakcja"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "Transakcja utworzona"
@@ -3083,7 +3124,7 @@ msgstr "Wpisz kluczową frazę (zwyczajowo 12 słów)"
msgid "Uh oh..."
msgstr "Ups..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Niepotwierdzone"
@@ -3157,7 +3198,7 @@ msgstr "Zobacz transakcje na Insight"
msgid "View Update"
msgstr "Zobacz aktualizacje"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Zobacz na blockchainie"
@@ -3277,7 +3318,7 @@ msgstr "Rodzaj portfela"
msgid "Wallet already exists"
msgstr "Portfel już istnieje"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr ""
@@ -3319,8 +3360,8 @@ msgstr "Portfel nie ma kopii zapasowej"
msgid "Wallet not found"
msgstr "Nie znaleziono portfela"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Portfel nie jest zarejestrowany"
@@ -3328,9 +3369,9 @@ msgstr "Portfel nie jest zarejestrowany"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "Portfel nie jest zarejestrowany w Wallet Service. Odtwórz go używając polecenia \"Utwórz portfel\" z wykorzystaniem kluczowej frazy w ustawieniach zaawansowanych"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "Kluczowa fraza niedostępna."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr ""
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Nie znaleziono serwera"
msgid "Wallets"
msgstr "Portfele"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Portfele i integracja"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "Uważaj!"
msgid "We'd love to do better."
msgstr "Chcielibyśmy zrobić to lepiej."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "Potwierdzimy na następnym ekranie."
@@ -3409,7 +3446,7 @@ msgstr "Czy zechciałbyś ocenić {{appName}} w app store?"
msgid "Would you like to receive push notifications about payments?"
msgstr "Czy chcesz otrzymywać wyskakujące powiadomienia o płatnościach?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Nieprawidłowa ilość słów frazy:"
@@ -3445,7 +3482,7 @@ msgstr "Możesz zobaczyć postępy prac i przyczynić się do rozwoju tej aplika
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "Bitcoiny możesz wydać w milionach sklepów i stron internetowych na całym świecie."
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "Nadal możesz go wyeksportować w Zaawansowane > Eksport."
@@ -3523,10 +3560,10 @@ msgstr "Twój portfel nigdy nie jest przechowywany w chmurze lub na urządzeniac
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "Twój portfel będzie zaszyfrowany. Hasło wypłat nie będzie mogło być odzyskane. Pamiętaj, aby je zapisać."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3545,7 +3582,7 @@ msgstr "dodaj swoje karty BitPay Visa"
msgid "locked by pending payments"
msgstr "zablokowane przez oczekujące wypłaty"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "ja"
@@ -3557,6 +3594,10 @@ msgstr "nazwa@przyklad.com"
msgid "preparing..."
msgstr "Przygotowywanie..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr ""
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} dla karty upominkowej Amazon.com"
@@ -3569,11 +3610,11 @@ msgstr ""
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr "{{appName}} 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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} zostanie potrącone jako prowizja sieci bitcoin."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr ""
@@ -3581,7 +3622,7 @@ msgstr ""
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transakcje pobrane"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 4e70bdfda..399157efd 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-09-20 16:53-0400\n"
+"PO-Revision-Date: 2017-10-10 08:58-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(Confiável)"
msgid "(possible double spend)"
msgstr "(Possível gasto duplo)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Uma proposta de pagamento pode ser apagada se 1) você é o criador e outro copayer não subscreveu, ou 2) Passaram-se 24 horas desde que a proposta foi criada."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "- {{btx.feeRateStr}} da transação"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "- {{tx.feeRateStr}} da transação"
@@ -48,16 +48,16 @@ msgstr "Somente resgatável no Mercado Livre (Brasil)"
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:380
+#: src/js/controllers/confirm.js:401
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:374
+#: src/js/controllers/confirm.js:395
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."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "Sobre"
@@ -102,7 +102,7 @@ msgstr "Adicionar contacto"
msgid "Add Funds"
msgstr "Adicionar fundos"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Adicionar nota"
@@ -126,7 +126,7 @@ msgstr "Adicionar uma senha opcional para asegurar a frase de recuperação"
msgid "Add as a contact"
msgstr "Adicionar como um contato"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Adicionar descrição"
@@ -161,7 +161,7 @@ msgstr "Tipo de Endereço"
msgid "Addresses With Balance"
msgstr "Endereços com valores"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Avançado"
@@ -216,7 +216,7 @@ msgstr "Valor"
msgid "Amount below minimum allowed"
msgstr "Montante abaixo do mínimo permitido"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Montante muito grande"
@@ -248,7 +248,7 @@ msgstr "Você está sendo observado? Qualquer pessoa com sua frase de recuperaç
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "Tem certeza que deseja cancelar e eliminar esta carteira?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "Tem certeza que deseja excluir este contato?"
@@ -301,8 +301,8 @@ 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/cashScan.html:22
-msgid "BTC Wallets"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
msgstr "Carteiras BTC"
#: www/views/preferences.html:34
@@ -317,8 +317,9 @@ 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"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Backup necessário"
@@ -335,7 +336,7 @@ msgstr "Criar cópia da carteira"
msgid "Backup your wallet before using this function"
msgstr "Faça backup da sua carteira antes de usar esta função"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Convite para carteira inválido"
@@ -365,12 +366,22 @@ msgstr "Saldos Bitcoin Cash (BCH)"
msgid "Bitcoin Cash Support"
msgstr "Suportar Bitcoin Cash"
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr "Carteiras Bitcoin Cash"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Política de taxa de rede Bitcoin"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr "Carteiras Bitcoin"
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
msgstr "Pagamento Bitcoin Cash"
@@ -428,7 +439,7 @@ msgstr "Comprar Bitcoin"
#: www/views/mercadoLibre.html:22
#: www/views/mercadoLibre.html:50
msgid "Buy a Gift Card"
-msgstr "Comprar um Vale-presente"
+msgstr "Comprar um Vale-Presente"
#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
@@ -444,7 +455,7 @@ msgstr "A calcular taxa"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "Cancelar convite"
msgid "Cannot Create Wallet"
msgstr "Não é possível criar a carteira"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "Não pode juntar-se a mesma carteira mais que uma vez"
@@ -497,7 +508,7 @@ msgstr "Escolha a sua carteira de destino"
msgid "Choose your source wallet"
msgstr "Escolha a sua carteira de origem"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Eliminar"
@@ -505,16 +516,16 @@ msgstr "Eliminar"
msgid "Clear cache"
msgstr "Limpar cache"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
msgstr "Clique para aceitar"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
msgstr "Clique para pagar"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
msgstr "Clique para enviar"
@@ -552,11 +563,11 @@ msgstr "Concluído"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Confirmar & Terminado"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "Confirmar compra"
@@ -580,7 +590,7 @@ msgstr "Confirme o seu PIN"
msgid "Confirm your new spending password"
msgstr "Confirme a nova senha de pagamento"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Confirmações"
@@ -617,6 +627,10 @@ msgstr "Continuar"
msgid "Contribute Translations"
msgstr "Contribuir para a tradução"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr "Copay apenas suporta Bitcoin Cash utilizando a nova versão de endereço"
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Copayer já está nesta carteira"
@@ -657,7 +671,7 @@ msgstr "Copiar para área de transferência"
#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
-msgstr "Não foi possível acessar o serviço de vale-presente"
+msgstr "Não foi possível acessar o serviço de Vale-Presente"
#: www/views/tab-import-phrase.html:2
msgid "Could not access the wallet at the server. Please check:"
@@ -667,11 +681,11 @@ msgstr "Não foi possível acessar a carteira no servidor. Por favor, verifique:
msgid "Could not access to Amazon.com"
msgstr "Não foi possível acessar a Amazon.com"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "Impossível aceder à carteira"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
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"
@@ -697,15 +711,15 @@ msgstr "Não foi possível criar a fatura"
msgid "Could not create transaction"
msgstr "Não foi possível criar a transação"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "Não foi possível criar usando a chave privada estendida especificada"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "Não foi possível criar usando a chave privada estendida especificada"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Não foi possível criar: Frase de recuperação de carteira inválida"
@@ -717,7 +731,7 @@ msgstr "Não foi possível descriptografar o arquivo, verifique sua senha"
msgid "Could not delete payment proposal"
msgstr "Não foi possível excluir a proposta de pagamento"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
msgstr "Não foi possível duplicar"
@@ -743,17 +757,17 @@ msgstr "Não foi possível obter a fatura"
msgid "Could not get transactions"
msgstr "Não foi possível obter o histórico das transações"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "Não foi possível importar"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "Não foi possível importar. Verifique o arquivo de entrada e senha de compra"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "Impossível juntar à carteira"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Criar carteira partilhada"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Criar carteira bitcoin"
@@ -821,8 +835,8 @@ msgstr "Criar carteira partilhada"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Criar carteira de {{formData.requiredCopayers}}-de-{{formData.totalCopayers}}"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Criado por"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr "Taxa personalizada"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Data"
@@ -861,7 +875,7 @@ msgstr "Data"
msgid "Delete"
msgstr "Eliminar"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Excluir Proposta de Pagamento"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "Detalhes"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Desativado"
@@ -924,7 +938,7 @@ msgstr "Não vê o seu idioma no Crowdin? Contacte o Dono no Crowdin! Nós adora
msgid "Download"
msgstr "Download"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr "Duplicado para BCH"
@@ -1012,14 +1026,14 @@ msgstr "Digite a frase de recuperação (BIP39)"
msgid "Enter your email"
msgstr "Digite seu e-mail"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Digite sua senha"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Digite sua senha"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Digite sua senha"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Digite sua senha"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Digite sua senha"
msgid "Error"
msgstr "Erro"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Erro na confirmação"
@@ -1108,11 +1122,11 @@ msgstr "Erro ao criar vale-presente"
msgid "Error creating the invoice"
msgstr "Erro ao criar a fatura"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Erro na criação da carteira"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "Erro ao obter informações de SendMax"
@@ -1142,16 +1156,16 @@ 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:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Expirado"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "Expira"
@@ -1194,7 +1208,7 @@ msgstr "Falha ao exportar"
msgid "Family vacation funds"
msgstr "Fundos de férias com a família"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Taxa"
@@ -1206,8 +1220,8 @@ msgstr "Nível de taxa"
msgid "Fee level is not defined"
msgstr "Nível de taxa não está definido"
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "Taxa:"
@@ -1281,7 +1295,7 @@ msgstr "Saldos encontrados:"
msgid "Funds to be added"
msgstr "Fundos a ser adicionado"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Saldos transferidos"
@@ -1330,15 +1344,15 @@ msgstr "Comece adicionando o primeiro."
msgid "Getting fee levels..."
msgstr "Obtendo níveis de taxa..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr "Vale-Presente"
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
-msgstr "Vale-presente não está mais disponível para uso"
-
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "Vale-presente"
+msgstr "Vale-Presente não está mais disponível para uso"
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
@@ -1350,18 +1364,20 @@ msgstr "Vale-presente gerado e pronto para uso."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Retroceder"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1397,7 +1413,7 @@ msgid "Help & Support"
msgstr "Ajuda e suporte"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "Informações de Ajuda e Suporte estão disponíveis no site."
@@ -1476,7 +1492,7 @@ msgstr "Eu entendi que se esse aplicativo for movido para outro dispositivo ou d
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Eu entendi que meu saldo são mantidos em segurança neste dispositivo e não por uma empresa."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "Já escrevi isso"
@@ -1525,7 +1541,7 @@ msgstr "Importar carteira"
msgid "Importing Wallet..."
msgstr "A importar a carteira..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "A fim de verificar o seu backup de carteira, por favor, digite sua senha."
@@ -1534,10 +1550,10 @@ msgstr "A fim de verificar o seu backup de carteira, por favor, digite sua senha
msgid "Inactive"
msgstr "Inativo"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Incompleto"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr "Endereço de rede incorreto"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Fundos insuficientes"
@@ -1570,6 +1586,10 @@ msgstr "Fundos insuficientes"
msgid "Insufficient funds for fee"
msgstr "Fundos insuficientes para taxa"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr "Integrações"
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Inválido"
@@ -1613,7 +1633,7 @@ msgstr "Fatura expirada"
msgid "Is there anything we could do better?"
msgstr "Há algo mais que podemos ajudar?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "Isto está correto?"
@@ -1663,13 +1683,14 @@ msgstr "Idioma"
msgid "Last Month"
msgstr "Mês anterior"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
msgstr "Saiba mais"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Vamos verificar a sua frase de backup."
@@ -1741,20 +1762,20 @@ msgstr "Meh - está tudo bem"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Nota"
#: www/views/mercadoLibre.html:6
msgid "Mercado Livre Brazil Gift Cards"
-msgstr "Vales-presente do Mercado Livre Brasil"
+msgstr "Vales-Presente do Mercado Livre Brasil"
#: src/js/controllers/buyMercadoLibre.js:98
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr "Serviço de Vale-Presente Mercado Livre não está disponível neste momento. Por favor, tente mais tarde."
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Mensagem Publicitária"
@@ -1888,15 +1909,19 @@ msgstr "Sem carteira selecionada"
msgid "No wallets available"
msgstr "Não há carteiras disponíveis"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "Nenhuma Carteira disponível para receber fundos"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
msgstr "Sem carteiras elegíveis para suporte a Bitcoin Cash"
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr "Carteira sem BIP44"
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr "Carteiras BTC não elegíveis"
@@ -1908,7 +1933,7 @@ msgstr "Normal"
msgid "Not authorized"
msgstr "Não autorizada"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "Não há fundos para taxa"
@@ -1929,6 +1954,10 @@ msgstr "Agora não"
msgid "Note"
msgstr "Nota"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr "Nota: se esta carteira BCH foi duplicada de uma carteira BTC, elas compartilham a mesma frase de recuperação."
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Aviso: Apenas Carteiras 1-1 (de assinatura única) podem ser usadas para vender bitcoins"
@@ -1942,7 +1971,7 @@ msgstr "Notificações"
msgid "Notifications by email"
msgstr "Notificações por e-mail"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "Me informe se confirmado"
@@ -1993,9 +2022,10 @@ 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:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Abrir"
@@ -2033,6 +2063,10 @@ msgstr "Abrir Site"
msgid "Open bitcoincash.org?"
msgstr "Abrir bitcoincash.org?"
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr "Abrir ferramenta de recuperação."
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Abrir Carteira"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Pagamento Rejeitado"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,7 +2167,7 @@ msgstr "Pagamento aceito. Ele será publicado por Glidera. Em caso de problema,
msgid "Payment address was translated to new Bitcoin Cash address format:"
msgstr "Endereço de pagamento foi traduzido para o novo formato de endereço Bitcoin Cash:"
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Detalhes do pagamento"
@@ -2154,11 +2188,11 @@ msgstr "Proposta pendente"
msgid "Permanently delete this wallet."
msgstr "Excluir permanentemente esta carteira."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Carteira Pessoal"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Por favor, anote esta frase com cuidado."
@@ -2166,7 +2200,7 @@ msgstr "Por favor, anote esta frase com cuidado."
msgid "Please connect a camera to get started."
msgstr "Por favor conecte uma câmera para iniciar."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Por favor, digite a frase de recuperação"
@@ -2179,7 +2213,7 @@ msgstr "Por favor, digite a frase de recuperação da carteira"
msgid "Please enter your PIN"
msgstr "Introduza o seu PIN"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Por favor escolhe cada palavra na ordem correta."
@@ -2212,7 +2246,7 @@ msgstr "A preparar os endereços..."
msgid "Preparing backup..."
msgstr "A preparar o backup..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Pressione novamente para sair"
@@ -2238,7 +2272,7 @@ msgstr "Proposta aceite"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Proposta criada"
@@ -2300,12 +2334,16 @@ msgstr "Ler mais"
msgid "Read more in our Wiki"
msgstr "Leia mais em nosso Wiki"
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr "Carteira somente leitura"
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "Receber"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr "Receber em"
@@ -2463,7 +2501,7 @@ msgstr "Escanear novamente"
msgid "Scan your fingerprint please"
msgstr "Escaneie sua impressão digital, por favor"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
msgstr "Pesquisar suas carteiras por Bitcoin Cash"
@@ -2471,7 +2509,7 @@ msgstr "Pesquisar suas carteiras por Bitcoin Cash"
msgid "Scanning Wallet funds..."
msgstr "Pesquisando fundos de carteira…"
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
msgstr "Pesquisando fundos..."
@@ -2544,7 +2582,7 @@ msgstr "Enviar endereços por e-mail"
msgid "Send by email"
msgstr "Enviar por E-mail"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Enviar De"
@@ -2583,7 +2621,7 @@ msgstr "Quantidade máxima de envio"
msgid "Sending transaction"
msgstr "Enviando transação"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Enviando {{amountStr}} de sua carteira {{name}}"
@@ -2698,25 +2736,28 @@ msgstr "Único endereço carteira"
msgid "Skip"
msgstr "Pular"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr "Deslize para aceitar"
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "Deslize para comprar"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr "Deslize para pagar"
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr "Deslize para enviar"
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr "Algumas das suas carteiras não são elegíveis para suportar Bitcoin Cash. Você pode tentar acessar fundos BCH destas carteiras usando a"
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,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:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Este bitcoin pagamento pedido expirou."
@@ -2944,15 +2985,15 @@ msgstr "Este bitcoin pagamento pedido expirou."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "Esta senha não pode ser recuperada. Se a senha for perdida, não há nenhuma maneira que você poderia recuperar seus fundos."
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Esta frase de recuperação foi criada com uma senha. Para recuperar esta carteira, tanto a frase de recuperação como a senha são necessárias."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr "Este valor de transação é muito pequeno em comparação com as taxas de rede Bitcoin atuais. Gastar estes fundos terão uma taxa de rede Bitcoin maior do que o fundo em si."
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Esta operação poderá demorar muito tempo para ser confirmada ou poderá ser descartada devido às baixas taxas definidas pelo remetente"
@@ -2961,14 +3002,14 @@ msgstr "Esta operação poderá demorar muito tempo para ser confirmada ou poder
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Esta carteira não está registrada no dado serviço Wallet Service Bitcore (BWS) informado. Você pode recriá-la a partir da informação local."
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Cronograma"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Falha no Touch ID"
msgid "Transaction"
msgstr "Transação"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "Transação Criada"
@@ -3083,7 +3124,7 @@ msgstr "Digite a frase de recuperação (normalmente 12 palavras)"
msgid "Uh oh..."
msgstr "Uh oh..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Não confirmado"
@@ -3157,7 +3198,7 @@ msgstr "Exibir Transação no Insight"
msgid "View Update"
msgstr "Ver atualizações"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Ver no blockchain"
@@ -3277,7 +3318,7 @@ msgstr "Tipo da carteira"
msgid "Wallet already exists"
msgstr "A carteira já existe"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr "Carteira já existente no {{appName}}"
@@ -3319,8 +3360,8 @@ msgstr "Carteira sem backup"
msgid "Wallet not found"
msgstr "Carteira não encontrada"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Carteira não registrada"
@@ -3328,9 +3369,9 @@ msgstr "Carteira não registrada"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "Carteira não registrada no serviço de carteira. Recriá-la em \"Criar carteira\" usando \"Opções avançadas\" para definir a sua frase de recuperação"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "Frase de recuperação da carteira não disponível."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr "Frase de recuperação da carteira não disponível"
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Serviço de carteira não encontrado"
msgid "Wallets"
msgstr "Carteiras"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Carteiras & Integrações"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "Cuidado!"
msgid "We'd love to do better."
msgstr "Nós adoraríamos fazer melhor."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "Confirmaremos na próxima tela."
@@ -3409,7 +3446,7 @@ msgstr "Você estaria disposto a dar uma nota ao {{appName}} na app store?"
msgid "Would you like to receive push notifications about payments?"
msgstr "Gostaria de receber notificações push sobre pagamentos?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Número errado de palavras de recuperação:"
@@ -3445,7 +3482,7 @@ msgstr "Você pode ver os mais recentes desenvolvimentos e contribuir para este
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "Você pode gastar bitcoins em milhões de sites e lojas em todo o mundo."
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "Você ainda pode exportá-la em Avançado > Exportar."
@@ -3476,7 +3513,7 @@ msgstr "Seu BitPay Card está pronto. Adicione fundos ao seu cartão para começ
#: www/views/mercadoLibre.html:57
#: www/views/mercadoLibreCards.html:6
msgid "Your Gift Cards"
-msgstr "Seus Vales-presente"
+msgstr "Seus Vales-Presente"
#: www/views/includes/confirmBackupPopup.html:6
msgid "Your bitcoin wallet is backed up!"
@@ -3523,10 +3560,10 @@ msgstr "Sua carteira nunca foi salva num armazenamento em nuvem ou dispositivo p
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "Sua chave da carteira será criptografada. A senha de gastos não poderá ser recuperada. Não se esqueça de anotá-la."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3545,7 +3582,7 @@ msgstr "Adicionar seu(s) cartão(ões) BitPay Visa"
msgid "locked by pending payments"
msgstr "bloqueado por pagamentos pendentes"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "eu"
@@ -3557,23 +3594,27 @@ msgstr "nome@exemplo.pt"
msgid "preparing..."
msgstr "a preparar..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr "ferramenta de recuperação."
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
-msgstr "{{amountStr}} em Vale-presente da Amazon.com"
+msgstr "{{amountStr}} em Vale-Presente da Amazon.com"
#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
-msgstr "{{amountStr}} em Vale-presente do Mercado Livre Brasil"
+msgstr "{{amountStr}} em Vale-Presente do Mercado Livre Brasil"
#: 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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} será deduzido para taxas de rede bitcoins."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} da quantidade de envio"
@@ -3581,7 +3622,7 @@ msgstr "{{tx.txp[wallet.id].feeRatePerStr}} da quantidade de envio"
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "Transações de {{updatingTxHistoryProgress}} transferidas"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index e1c5b3f7e..a66925501 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-09-20 16:53-0400\n"
+"PO-Revision-Date: 2017-10-09 10:33-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "(Доверенный)"
msgid "(possible double spend)"
msgstr "(возможна двойная трата)"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* Предложенный платёж может быть удалён если 1) вы создали этот платёж и никто его еще не подписал, или 2) если прошло более 24 часов с момента его создания."
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "{{feeRateStr}} транзакции"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr ""
@@ -48,16 +48,16 @@ msgstr ""
msgid "A member of the team will review your feedback as soon as possible."
msgstr "Участник команды рассмотрит ваш отзыв при первой возможности."
-#: src/js/controllers/confirm.js:380
+#: src/js/controllers/confirm.js:401
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "Всего {{amountAboveMaxSizeStr}} было исключено. Превышен максимальный размер, разрешенный для транзакции."
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:395
msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided."
msgstr "Примечание: в общей сложности {{amountBelowFeeStr}} было исключено. Эти средства входят поступившие в UTXOs меньше чем комиссия сети."
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "О проекте"
@@ -102,7 +102,7 @@ msgstr "Добавить контакт"
msgid "Add Funds"
msgstr "Пополнить счёт"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "Добавить памятку"
@@ -126,7 +126,7 @@ msgstr "Добавьте необязательный пароль для защ
msgid "Add as a contact"
msgstr "Добавить контакт"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "Добавить описание"
@@ -161,7 +161,7 @@ msgstr "Тип адреса"
msgid "Addresses With Balance"
msgstr "Адреса с балансом"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "Дополнительные возможности"
@@ -216,7 +216,7 @@ msgstr "Сумма"
msgid "Amount below minimum allowed"
msgstr "Сумма ниже допустимого минимума"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "Слишком большая сумма"
@@ -248,7 +248,7 @@ msgstr "За вами подглядывают? Любой у кого есть
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "Вы точно хотите отменить и удалить этот кошелёк?"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "Вы действительно хотите удалить этот контакт?"
@@ -301,8 +301,8 @@ msgstr "Среднее время подтверждения"
msgid "BIP32 path for address derivation"
msgstr "Укажите BIP32 для генерации адресов"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
msgstr ""
#: www/views/preferences.html:34
@@ -317,8 +317,9 @@ msgstr "Требуется резервное копирование"
msgid "Backup all livenet wallets before using this function"
msgstr "Сделайте резервную копию всех livenet кошельков перед использованием этой функции"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Требуется резервное копирование"
@@ -335,7 +336,7 @@ msgstr "Резервное копирование"
msgid "Backup your wallet before using this function"
msgstr "Сделайте резервную копию вашего кошелька перед использованием этой функции"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "Недействительное приглашение"
@@ -365,12 +366,22 @@ msgstr ""
msgid "Bitcoin Cash Support"
msgstr ""
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Политика комиссии сети Биткойн"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr ""
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
msgstr ""
@@ -444,7 +455,7 @@ msgstr "Вычисление комиссии"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "Отменить приглашение?"
msgid "Cannot Create Wallet"
msgstr "Не удаётся создать кошелёк"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "Нельзя присоединиться к одному и тому же кошельку более одного раза"
@@ -497,7 +508,7 @@ msgstr "Выберите целевой кошелёк"
msgid "Choose your source wallet"
msgstr "Выберите исходный кошелёк"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "Очистить"
@@ -505,16 +516,16 @@ msgstr "Очистить"
msgid "Clear cache"
msgstr "Очистить кэш"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
msgstr "Подтвердить"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
msgstr "Оплатить"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
msgstr "Отправить"
@@ -552,11 +563,11 @@ msgstr "Завершено"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "Подтвердить & Завершить"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "Подтвердить покупку"
@@ -580,7 +590,7 @@ msgstr "Подтвердите Ваш PIN-код"
msgid "Confirm your new spending password"
msgstr "Подтвердите ваш новый платёжный пароль"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "Подтверждения"
@@ -617,6 +627,10 @@ msgstr "Продолжить"
msgid "Contribute Translations"
msgstr "Помочь в переводе"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr ""
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Совладелец кошелька уже присоединился"
@@ -667,11 +681,11 @@ msgstr "Не удалось получить доступ к кошельку н
msgid "Could not access to Amazon.com"
msgstr ""
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "Не удалось получить доступ к кошельку"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Не удалось добавить сообщение в импортированный кошелёк без общего ключа шифрования"
@@ -697,15 +711,15 @@ msgstr ""
msgid "Could not create transaction"
msgstr ""
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "Не удалось создать используя указанный расширенный закрытый ключ"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "Не удалось создать используя указанный расширенный открытый ключ"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Не удалось создать: недействительное ключевое словосочетание"
@@ -717,7 +731,7 @@ msgstr "Не удалось расшифровать файл, проверьт
msgid "Could not delete payment proposal"
msgstr "Не удалось удалить предложенный платёж"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
msgstr ""
@@ -743,17 +757,17 @@ msgstr ""
msgid "Could not get transactions"
msgstr "Не удалось получить транзакции"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "Не удалось импортировать"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "Не удалось импортировать. Проверьте импортируемый файл и платёжный пароль"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "Не удалось присоединиться к кошельку"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "Создать общий кошелёк"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "Создать биткойн-кошелёк"
@@ -821,8 +835,8 @@ msgstr "Создать общий кошелёк"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Создать кошелёк {{formData.requiredCopayers}}-из-{{formData.totalCopayers}}"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "Создан"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr ""
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "Дата"
@@ -861,7 +875,7 @@ msgstr "Дата"
msgid "Delete"
msgstr "Удалить"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "Удалить предложенный платёж"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "Подробности"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Отключено"
@@ -924,7 +938,7 @@ msgstr "Не видите свой язык на Crowdin? Свяжитесь с
msgid "Download"
msgstr "Скачать"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
msgstr ""
@@ -1012,14 +1026,14 @@ msgstr "Введите ключевое словосочетание (BIP39)"
msgid "Enter your email"
msgstr "Введите Ваш email"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "Введите пароль"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "Введите пароль"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "Введите пароль"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "Введите пароль"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,7 +1109,7 @@ msgstr "Введите пароль"
msgid "Error"
msgstr "Ошибка"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "Ошибка при подтверждении"
@@ -1108,11 +1122,11 @@ msgstr "Ошибка создания Подарочной карты"
msgid "Error creating the invoice"
msgstr ""
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "Ошибка создания кошелька"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr ""
@@ -1142,16 +1156,16 @@ msgstr "Ошибка обновления Дебетовых Карт"
msgid "Exceeded daily limit of $500 per user"
msgstr "Превышен дневной лимит в 500$ на пользователя"
-#: src/js/controllers/confirm.js:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "Истекла"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "истёк"
@@ -1194,7 +1208,7 @@ msgstr "Не удалось экспортировать"
msgid "Family vacation funds"
msgstr "Отпускной бюджет"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "Комиссия"
@@ -1206,8 +1220,8 @@ msgstr ""
msgid "Fee level is not defined"
msgstr ""
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "Комиссия:"
@@ -1281,7 +1295,7 @@ msgstr "Обнаружены средства:"
msgid "Funds to be added"
msgstr ""
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "Средства переведены"
@@ -1330,16 +1344,16 @@ msgstr "Начните, добавив первый контакт."
msgid "Getting fee levels..."
msgstr "Получение информации о комиссиях..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr ""
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr ""
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "Подарочная карта"
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr ""
@@ -1350,18 +1364,20 @@ msgstr ""
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Вернуться"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1397,7 +1413,7 @@ msgid "Help & Support"
msgstr "Помощь и поддержка"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
msgstr "Информация о помощи и поддержке доступна на сайте."
@@ -1476,7 +1492,7 @@ msgstr "Я осознаю, что если {{appName}} будет перемещ
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "Я понимаю, что мои средства безопасно хранятся на устройстве, а не компанией."
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "Я записал"
@@ -1525,7 +1541,7 @@ msgstr "Импортировать кошелёк"
msgid "Importing Wallet..."
msgstr "Импортирование кошелька..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "Для проверки резервной копии требуется ввести пароль."
@@ -1534,10 +1550,10 @@ msgstr "Для проверки резервной копии требуется
msgid "Inactive"
msgstr ""
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "Не все совладельцы присоединились"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr ""
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Недостаточно средств"
@@ -1570,6 +1586,10 @@ msgstr "Недостаточно средств"
msgid "Insufficient funds for fee"
msgstr "Недостаточно средств на комиссию"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr ""
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "Недействительно"
@@ -1613,7 +1633,7 @@ msgstr ""
msgid "Is there anything we could do better?"
msgstr "Есть ли что-то, что мы могли бы сделать лучше?"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "Правильно?"
@@ -1663,13 +1683,14 @@ msgstr "Язык"
msgid "Last Month"
msgstr "Прошедший месяц"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
msgstr ""
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "Давайте проверим ваше ключевое словосочетание."
@@ -1741,8 +1762,8 @@ msgstr "Ну так, терпимо"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "Памятка"
@@ -1754,7 +1775,7 @@ msgstr ""
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr ""
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "Сообщение от продавца"
@@ -1888,15 +1909,19 @@ msgstr "Не выбран кошелёк"
msgid "No wallets available"
msgstr ""
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "Некуда перевести средства"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
msgstr ""
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr ""
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
msgstr ""
@@ -1908,7 +1933,7 @@ msgstr "Обычная"
msgid "Not authorized"
msgstr "Не авторизован"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "Недостаточно средств для уплаты комиссии"
@@ -1929,6 +1954,10 @@ msgstr "Потом"
msgid "Note"
msgstr "Примечание"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr ""
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "Внимание: только 1-1 кошельки (требующие одной подписи) могут быть использованы для продажи биткойн"
@@ -1942,7 +1971,7 @@ msgstr "Уведомления"
msgid "Notifications by email"
msgstr ""
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr ""
@@ -1993,9 +2022,10 @@ msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr "На этой вкладке вы можете видеть все ваши кошельки, учетные записи и активы."
#: src/js/controllers/bitpayCard.js:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Открыть"
@@ -2033,6 +2063,10 @@ msgstr "Перейти на сайт"
msgid "Open bitcoincash.org?"
msgstr ""
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr ""
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Открыть кошелёк"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "Платёж отклонён"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2133,7 +2167,7 @@ msgstr "Платёж принят и будет отправлен Glidera. В
msgid "Payment address was translated to new Bitcoin Cash address format:"
msgstr ""
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "Детали платежа"
@@ -2154,11 +2188,11 @@ msgstr "Рассматриваемые платежи"
msgid "Permanently delete this wallet."
msgstr "Навсегда удалить этот кошелёк."
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "Личный кошелёк"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "Внимательно запишите ключевое словосочетание."
@@ -2166,7 +2200,7 @@ msgstr "Внимательно запишите ключевое словосо
msgid "Please connect a camera to get started."
msgstr "Чтобы начать, подключите камеру."
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "Введите ключевое словосочетание"
@@ -2179,7 +2213,7 @@ msgstr "Введите ключевое словосочетание кошел
msgid "Please enter your PIN"
msgstr "Пожалуйста, введите Ваш PIN-код"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "Тапните каждое слово в правильном порядке."
@@ -2212,7 +2246,7 @@ msgstr "Подготовка адресов..."
msgid "Preparing backup..."
msgstr "Подготовка резервной копии..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "Нажмите еще раз для выхода"
@@ -2238,7 +2272,7 @@ msgstr "Платёж принят"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "Платёж создан"
@@ -2300,12 +2334,16 @@ msgstr "Показать больше"
msgid "Read more in our Wiki"
msgstr ""
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr ""
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "Получить"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr ""
@@ -2463,7 +2501,7 @@ msgstr ""
msgid "Scan your fingerprint please"
msgstr "Пожалуйста, отсканируйте ваш отпечаток пальца"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
msgstr ""
@@ -2471,7 +2509,7 @@ msgstr ""
msgid "Scanning Wallet funds..."
msgstr "Сканирование адресов кошелька..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
msgstr ""
@@ -2544,7 +2582,7 @@ msgstr "Отправить адреса по email"
msgid "Send by email"
msgstr "Отправить на email"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "Отправить от"
@@ -2583,7 +2621,7 @@ msgstr "Отправляю максимальную сумму"
msgid "Sending transaction"
msgstr "Отправка транзакции"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Отправка {{amountStr}} из вашего кошелька {{name}}"
@@ -2698,25 +2736,28 @@ msgstr "Кошелёк с одним адресом"
msgid "Skip"
msgstr "Пропустить"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
msgstr ""
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr ""
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
msgstr ""
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
msgstr ""
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr ""
+
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
@@ -2934,7 +2975,7 @@ msgstr "Замечательное приложение!"
msgid "This app stores your bitcoin with cutting-edge security."
msgstr ""
-#: src/js/controllers/confirm.js:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "Этот запрос платежа истёк."
@@ -2944,15 +2985,15 @@ msgstr "Этот запрос платежа истёк."
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr ""
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "Это ключевое словосочетание было создано с паролем. Для восстановления кошелька необходимо ключевое словосочетание и его пароль."
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr ""
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr ""
@@ -2961,14 +3002,14 @@ msgstr ""
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "Это кошелёк не зарегистрирован на данном сервере Bitcore. Вы можете воссоздать его из локальной информации."
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "Хронология"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "Ошибка Touch ID"
msgid "Transaction"
msgstr "Транзакция"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr ""
@@ -3083,7 +3124,7 @@ msgstr "Введите ключевое словосочетание (обычн
msgid "Uh oh..."
msgstr "Упс..."
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "Неподтверждено"
@@ -3157,7 +3198,7 @@ msgstr "Просмотреть транзакцию на Insight"
msgid "View Update"
msgstr "Просмотреть обновление"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "Посмотреть в блокчейне"
@@ -3277,7 +3318,7 @@ msgstr "Тип кошелька"
msgid "Wallet already exists"
msgstr "Кошелёк уже существует"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr ""
@@ -3319,8 +3360,8 @@ msgstr "Резервное копирование не выполнено"
msgid "Wallet not found"
msgstr "Кошелёк не найден"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "Кошелёк не зарегистрирован"
@@ -3328,9 +3369,9 @@ msgstr "Кошелёк не зарегистрирован"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "Кошелёк не зарегистрирован на сервере Bitcore. Пересоздайте кошелёк воспользовавшись дополнительными параметрами, чтобы указать ключевое словосочетание"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "Ключевое словосочетание недоступно."
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr ""
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "Сервер Bitcore не найден"
msgid "Wallets"
msgstr "Кошельки"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "Кошельки и интеграция"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "Осторожно!"
msgid "We'd love to do better."
msgstr "Мы хотели бы сделать лучше."
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "Проверим на следующем шаге."
@@ -3409,7 +3446,7 @@ msgstr ""
msgid "Would you like to receive push notifications about payments?"
msgstr "Вы хотели бы получать push-уведомления о платежах?"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "Неподходящее количество слов в ключевом словосочетании:"
@@ -3445,7 +3482,7 @@ msgstr ""
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr ""
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "Вы можете экспортировать её в Дополнительные параметры > Экспорт."
@@ -3523,10 +3560,10 @@ msgstr "Ваш кошелёк никогда не сохраняется в об
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "Ваш кошелёк будет зашифрован. Платёжный пароль нельзя восстановить. Обязательно его запишите."
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3545,7 +3582,7 @@ msgstr "добавьте вашу BitPay Visa карту(ы)"
msgid "locked by pending payments"
msgstr "заблокировано неподтверждёнными платежами"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "мне"
@@ -3557,6 +3594,10 @@ msgstr "name@example.com"
msgid "preparing..."
msgstr "Подготавливается..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr ""
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr ""
@@ -3569,11 +3610,11 @@ msgstr ""
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr "{{appName}} требует Bitcore для координации совладельцев и получения информации из блокчейна. По-умолчанию используется сервер https://bws.bitpay.com (публичный сервер Bitcore компании BitPay)."
-#: src/js/controllers/confirm.js:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} будет использовано для оплаты комиссии."
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr ""
@@ -3581,7 +3622,7 @@ msgstr ""
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} транзакций загружено"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/zh.po b/i18n/po/zh.po
index 153c19706..180b2f1c8 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-09-19 14:07-0400\n"
+"PO-Revision-Date: 2017-10-09 10:33-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -22,15 +22,15 @@ msgstr "（可信的）"
msgid "(possible double spend)"
msgstr "（重复支付）"
-#: www/views/modals/txp-details.html:161
+#: www/views/modals/txp-details.html:159
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
msgstr "* 如果 1) 你是创造者，及没有其他 copayer 签名，或 2) 24 小时已经过去，支付提议将被删除。"
-#: www/views/tx-details.html:84
+#: www/views/tx-details.html:82
msgid "- {{btx.feeRateStr}} of the transaction"
msgstr "-{{btx.feeRateStr}} 的交易记录"
-#: www/views/modals/txp-details.html:104
+#: www/views/modals/txp-details.html:102
msgid "- {{tx.feeRateStr}} of the transaction"
msgstr "-{{tx.feeRateStr}} 的交易记录"
@@ -41,23 +41,23 @@ msgstr "5 星评级帮助我们进入更多的人手, {{appName}} 和更多的
#: www/views/mercadoLibre.html:18
#: www/views/mercadoLibre.html:40
msgid "Only redeemable on Mercado Livre (Brazil)"
-msgstr "Only 可随时取现的梅尔卡多里弗 (巴西)"
+msgstr "Only可在悔尔卡多里弗(巴西) 兌換"
#: src/js/controllers/feedback/send.js:27
#: www/views/feedback/complete.html:21
msgid "A member of the team will review your feedback as soon as possible."
msgstr "团队的成员将尽快审查您的反馈意见。"
-#: src/js/controllers/confirm.js:380
+#: src/js/controllers/confirm.js:401
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "备注︰共有{{amountAboveMaxSizeStr}} 被排除了。超出了交易允许的最大体积"
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:395
msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided."
msgstr "备注：共有{{amountBelowFeeStr}} 被排除了。这些来自 UTXOs 的资金小于提供的网络费用。"
#: src/js/controllers/preferencesAbout.js:6
-#: www/views/tab-settings.html:161
+#: www/views/tab-settings.html:156
msgid "About"
msgstr "关于"
@@ -102,7 +102,7 @@ msgstr "添加联系人"
msgid "Add Funds"
msgstr "添加金额"
-#: www/views/confirm.html:96
+#: www/views/confirm.html:94
msgid "Add Memo"
msgstr "添加备注"
@@ -126,7 +126,7 @@ msgstr "添加可选的密码，以保护恢复短语"
msgid "Add as a contact"
msgstr "添加到联系人"
-#: src/js/controllers/confirm.js:403
+#: src/js/controllers/confirm.js:424
msgid "Add description"
msgstr "添加描述"
@@ -161,7 +161,7 @@ msgstr "地址类型"
msgid "Addresses With Balance"
msgstr "地址与余额"
-#: www/views/tab-settings.html:154
+#: www/views/tab-settings.html:149
msgid "Advanced"
msgstr "進階"
@@ -204,7 +204,7 @@ msgstr "替代货币"
#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
-msgstr "亚马逊服务器暂时不可用，请稍候再试。"
+msgstr "亚马逊服务器暂时无法访问，请稍候再试。"
#: www/views/amount.html:44
#: www/views/customAmount.html:34
@@ -216,13 +216,13 @@ msgstr "数额"
msgid "Amount below minimum allowed"
msgstr "数额低于最低允许值"
-#: src/js/controllers/confirm.js:195
+#: src/js/controllers/confirm.js:216
msgid "Amount too big"
msgstr "量太大"
#: www/views/includes/walletHistory.html:31
msgid "Amount too low to spend"
-msgstr "数量太少，无法发送。"
+msgstr "數額低於可消費額"
#: src/js/controllers/tab-home.js:147
msgid "An update to this app is available. For your security, please update to the latest version."
@@ -248,7 +248,7 @@ msgstr "有旁观者么？只要有人知道了你的恢复短语，他就能访
msgid "Are you sure you want to cancel and delete this wallet?"
msgstr "确定取消和删除这个钱包？"
-#: src/js/controllers/addressbookView.js:24
+#: src/js/controllers/addressbookView.js:37
msgid "Are you sure you want to delete this contact?"
msgstr "你确定你要删除此联系人？"
@@ -301,9 +301,9 @@ msgstr "平均确认时间"
msgid "BIP32 path for address derivation"
msgstr "BIP32 路径的地址衍生"
-#: www/views/cashScan.html:22
-msgid "BTC Wallets"
-msgstr ""
+#: www/views/cashScan.html:25
+msgid "BTC wallets"
+msgstr "比特幣錢包"
#: www/views/preferences.html:34
msgid "Backup"
@@ -317,8 +317,9 @@ msgstr "需要备份"
msgid "Backup all livenet wallets before using this function"
msgstr "请在使用此功能之前备份你的钱包。"
+#: src/js/controllers/cashScan.js:64
+#: www/views/includes/walletListSettings.html:12
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "需要备份"
@@ -335,7 +336,7 @@ msgstr "备份钱包"
msgid "Backup your wallet before using this function"
msgstr "在使用此功能之前，请备份你的钱包。"
-#: src/js/services/profileService.js:445
+#: src/js/services/profileService.js:446
msgid "Bad wallet invitation"
msgstr "坏钱包邀请"
@@ -358,11 +359,16 @@ msgstr "比特币地址"
#: www/views/cashScan.html:4
msgid "Bitcoin Cash (BCH) Balances"
-msgstr ""
+msgstr "小比特幣(BCH) 結餘"
#: www/views/preferencesCash.html:3
#: www/views/tab-settings.html:47
msgid "Bitcoin Cash Support"
+msgstr "小比特幣支援"
+
+#: www/views/tab-home.html:98
+#: www/views/tab-settings.html:115
+msgid "Bitcoin Cash Wallets"
msgstr ""
#: www/views/modals/chooseFeeLevel.html:4
@@ -371,9 +377,14 @@ msgstr ""
msgid "Bitcoin Network Fee Policy"
msgstr "比特币网络手续费策略"
+#: www/views/tab-home.html:83
+#: www/views/tab-settings.html:107
+msgid "Bitcoin Wallets"
+msgstr ""
+
#: src/js/services/incomingData.js:151
msgid "Bitcoin cash Payment"
-msgstr ""
+msgstr "小比特幣支付"
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -444,7 +455,7 @@ msgstr "正在计算费用"
#: src/js/controllers/buyAmazon.js:313
#: src/js/controllers/buyMercadoLibre.js:307
-#: src/js/controllers/confirm.js:529
+#: src/js/controllers/confirm.js:550
#: src/js/controllers/topup.js:287
#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
@@ -469,7 +480,7 @@ msgstr "取消邀请"
msgid "Cannot Create Wallet"
msgstr "不能创建钱包"
-#: src/js/services/profileService.js:441
+#: src/js/services/profileService.js:442
msgid "Cannot join the same wallet more that once"
msgstr "无法重复加入同一个钱包"
@@ -497,7 +508,7 @@ msgstr "选择你的目的地钱包"
msgid "Choose your source wallet"
msgstr "选择源钱包"
-#: www/views/backup.html:54
+#: www/views/backup.html:61
msgid "Clear"
msgstr "清除"
@@ -505,19 +516,19 @@ msgstr "清除"
msgid "Clear cache"
msgstr "清空缓存"
-#: src/js/controllers/confirm.js:352
+#: src/js/controllers/confirm.js:373
#: src/js/controllers/modals/txpDetails.js:49
msgid "Click to accept"
-msgstr ""
+msgstr "在此點擊以接受"
-#: src/js/controllers/confirm.js:346
+#: src/js/controllers/confirm.js:367
msgid "Click to pay"
-msgstr ""
+msgstr "在此點擊以支付"
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:379
#: src/js/controllers/modals/txpDetails.js:42
msgid "Click to send"
-msgstr ""
+msgstr "點擊以寄出"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -532,7 +543,7 @@ msgstr "关闭"
#: www/views/includes/cash.html:2
#: www/views/preferencesInformation.html:17
msgid "Coin"
-msgstr ""
+msgstr "電子幣种"
#: www/views/preferences.html:22
msgid "Color"
@@ -552,11 +563,11 @@ msgstr "完成"
#: src/js/controllers/buyAmazon.js:311
#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:528
+#: src/js/controllers/confirm.js:549
#: src/js/controllers/copayers.js:55
#: src/js/controllers/topup.js:285
-#: www/views/backup.html:53
-#: www/views/backup.html:72
+#: www/views/backup.html:60
+#: www/views/backup.html:79
#: www/views/confirm.html:4
#: www/views/onboarding/collectEmail.html:32
msgid "Confirm"
@@ -568,7 +579,6 @@ msgid "Confirm & Finish"
msgstr "确认并完成"
#: www/views/buyAmazon.html:90
-#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
msgstr "确认购买"
@@ -580,7 +590,7 @@ msgstr "确认你的PIN码"
msgid "Confirm your new spending password"
msgstr "确认你的新支付密码"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:98
msgid "Confirmations"
msgstr "确认"
@@ -617,6 +627,10 @@ msgstr "继续"
msgid "Contribute Translations"
msgstr "参与翻译"
+#: src/js/controllers/confirm.js:130
+msgid "Copay only supports Bitcoin Cash using new version numbers addresses"
+msgstr "本公司Copay只支持用新版本數字地址的小比特幣"
+
#: src/js/services/bwcError.js:62
msgid "Copayer already in this wallet"
msgstr "Copayer 已经在这个钱包里"
@@ -667,11 +681,11 @@ msgstr "无法访问服务器上的钱包。请确认︰"
msgid "Could not access to Amazon.com"
msgstr "不能访问到亚马逊网站"
-#: src/js/services/profileService.js:510
+#: src/js/services/profileService.js:511
msgid "Could not access wallet"
msgstr "无法访问钱包"
-#: src/js/controllers/confirm.js:189
+#: src/js/controllers/confirm.js:210
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "无法将消息添加到进口钱包没有共享的加密密钥"
@@ -697,15 +711,15 @@ msgstr "不能创建发票"
msgid "Could not create transaction"
msgstr "无法创建交易记录"
-#: src/js/services/profileService.js:351
+#: src/js/services/profileService.js:350
msgid "Could not create using the specified extended private key"
msgstr "无法使用指定的扩展私人密钥创建"
-#: src/js/services/profileService.js:363
+#: src/js/services/profileService.js:362
msgid "Could not create using the specified extended public key"
msgstr "无法使用指定的扩展的公钥创建"
-#: src/js/services/profileService.js:339
+#: src/js/services/profileService.js:338
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "无法创建 ︰ 无效的钱包恢复短语"
@@ -717,9 +731,9 @@ msgstr "无法解密文件，请检查你的密码"
msgid "Could not delete payment proposal"
msgstr "无法删除支付提议"
-#: src/js/controllers/cashScan.js:101
+#: src/js/controllers/cashScan.js:117
msgid "Could not duplicate"
-msgstr ""
+msgstr "無法复制"
#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
@@ -743,17 +757,17 @@ msgstr "不能拿到发票"
msgid "Could not get transactions"
msgstr "不能交易"
-#: src/js/services/profileService.js:614
-#: src/js/services/profileService.js:649
-#: src/js/services/profileService.js:673
+#: src/js/services/profileService.js:615
+#: src/js/services/profileService.js:650
+#: src/js/services/profileService.js:674
msgid "Could not import"
msgstr "无法导入"
-#: src/js/services/profileService.js:583
+#: src/js/services/profileService.js:584
msgid "Could not import. Check input file and spending password"
msgstr "无法导入。请检查输入文件和支付密码"
-#: src/js/services/profileService.js:456
+#: src/js/services/profileService.js:457
msgid "Could not join wallet"
msgstr "无法加入钱包"
@@ -804,7 +818,7 @@ msgid "Create Shared Wallet"
msgstr "创建自己的免费钱包"
#: www/views/onboarding/tour.html:51
-#: www/views/tab-home.html:77
+#: www/views/tab-home.html:75
#: www/views/tab-send.html:36
msgid "Create bitcoin wallet"
msgstr "创建比特币的钱包"
@@ -821,8 +835,8 @@ msgstr "创建共享的钱包"
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "创建 {{formData.requiredCopayers}} 的{{formData.totalCopayers}} 钱包"
-#: www/views/modals/txp-details.html:83
-#: www/views/tx-details.html:62
+#: www/views/modals/txp-details.html:81
+#: www/views/tx-details.html:60
msgid "Created by"
msgstr "创建者:"
@@ -852,8 +866,8 @@ msgid "Custom Fee"
msgstr "使用自定义费率"
#: www/views/modals/mercadolibre-card-details.html:56
-#: www/views/modals/txp-details.html:89
-#: www/views/tx-details.html:68
+#: www/views/modals/txp-details.html:87
+#: www/views/tx-details.html:66
msgid "Date"
msgstr "日期"
@@ -861,7 +875,7 @@ msgstr "日期"
msgid "Delete"
msgstr "删除"
-#: www/views/modals/txp-details.html:166
+#: www/views/modals/txp-details.html:164
msgid "Delete Payment Proposal"
msgstr "删除支付提议"
@@ -901,7 +915,7 @@ msgid "Details"
msgstr "详情"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:64
+#: src/js/controllers/tab-settings.js:65
#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "已经禁用"
@@ -924,13 +938,13 @@ msgstr "在 Crowdin 找不到你的语言？请联系 Crowdin 的所有者！我
msgid "Download"
msgstr "下载"
-#: www/views/cashScan.html:36
+#: www/views/cashScan.html:37
msgid "Duplicate for BCH"
-msgstr ""
+msgstr "為小比特幣复制"
#: src/js/services/onGoingProcess.js:49
msgid "Duplicating wallet..."
-msgstr ""
+msgstr "复制錢包進行中"
#: www/views/addresses.html:19
msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment."
@@ -959,7 +973,7 @@ msgstr "已达到空地址限制。无法生成新的地址。"
#: www/views/preferencesCash.html:17
msgid "Enable Bitcoin Cash wallet creation and operation within the App."
-msgstr ""
+msgstr "能在本應用程序中創建和啟用小比特幣錢包"
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
@@ -979,7 +993,7 @@ msgstr "使该摄像机开始。"
#: www/views/tab-settings.html:49
msgid "Enabled"
-msgstr ""
+msgstr "巳啟用"
#: src/js/services/walletService.js:1047
#: src/js/services/walletService.js:1062
@@ -1012,14 +1026,14 @@ msgstr "输入恢复短语 (BIP39)"
msgid "Enter your email"
msgstr "输入您的电子邮件"
-#: www/views/backup.html:62
+#: www/views/backup.html:69
msgid "Enter your password"
msgstr "请输入你的密码"
#. Trying to import a malformed wallet export QR code
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
-#: src/js/controllers/addressbookView.js:29
+#: src/js/controllers/addressbookView.js:42
#: src/js/controllers/addresses.js:125
#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
@@ -1029,7 +1043,7 @@ msgstr "请输入你的密码"
#: src/js/controllers/buyAmazon.js:35
#: src/js/controllers/buyMercadoLibre.js:24
#: src/js/controllers/buyMercadoLibre.js:35
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
#: src/js/controllers/copayers.js:67
#: src/js/controllers/create.js:161
#: src/js/controllers/create.js:174
@@ -1055,8 +1069,8 @@ msgstr "请输入你的密码"
#: src/js/controllers/import.js:238
#: src/js/controllers/import.js:254
#: src/js/controllers/import.js:266
-#: src/js/controllers/import.js:277
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:278
+#: src/js/controllers/import.js:288
#: src/js/controllers/import.js:312
#: src/js/controllers/import.js:325
#: src/js/controllers/import.js:335
@@ -1081,7 +1095,7 @@ msgstr "请输入你的密码"
#: src/js/controllers/preferencesDelete.js:36
#: src/js/controllers/preferencesExternal.js:20
#: src/js/controllers/tab-home.js:174
-#: src/js/controllers/tab-send.js:133
+#: src/js/controllers/tab-send.js:143
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
#: src/js/controllers/topup.js:21
@@ -1095,24 +1109,24 @@ msgstr "请输入你的密码"
msgid "Error"
msgstr "错误！"
-#: src/js/controllers/confirm.js:481
+#: src/js/controllers/confirm.js:502
msgid "Error at confirm"
msgstr "在确认错误"
#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
-msgstr "错误创建礼品卡"
+msgstr "创建礼品卡时出错。"
#: src/js/controllers/buyAmazon.js:94
#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr "创建发票时出错"
-#: src/js/services/profileService.js:411
+#: src/js/services/profileService.js:412
msgid "Error creating wallet"
msgstr "创建钱包时出现错误"
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:296
msgid "Error getting SendMax information"
msgstr "获取SendMax信息时出错。"
@@ -1142,16 +1156,16 @@ msgstr "更新借记卡时出错"
msgid "Exceeded daily limit of $500 per user"
msgstr "超过 500 美元，每个用户的每日限额"
-#: src/js/controllers/confirm.js:440
+#: src/js/controllers/confirm.js:461
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
-#: www/views/modals/txp-details.html:121
+#: www/views/modals/txp-details.html:119
msgid "Expired"
msgstr "已过期"
#: www/views/modals/paypro.html:54
-#: www/views/modals/txp-details.html:127
+#: www/views/modals/txp-details.html:125
msgid "Expires"
msgstr "到期"
@@ -1194,7 +1208,7 @@ msgstr "导出失败"
msgid "Family vacation funds"
msgstr "家庭度假资金"
-#: www/views/tx-details.html:81
+#: www/views/tx-details.html:79
msgid "Fee"
msgstr "费用"
@@ -1206,8 +1220,8 @@ msgstr "费用等级"
msgid "Fee level is not defined"
msgstr "未定义收费等级。。"
-#: www/views/confirm.html:81
-#: www/views/modals/txp-details.html:101
+#: www/views/confirm.html:79
+#: www/views/modals/txp-details.html:99
msgid "Fee:"
msgstr "手续费:"
@@ -1281,13 +1295,13 @@ msgstr "找到资金"
msgid "Funds to be added"
msgstr "要添加的资金"
-#: www/views/paperWallet.html:53
+#: www/views/paperWallet.html:51
msgid "Funds transferred"
msgstr "资金转移"
#: www/views/topup.html:103
msgid "Funds were added to debit card"
-msgstr "增加了资金，以借记卡"
+msgstr "資金已添加到借寄卡"
#: www/views/paperWallet.html:22
msgid "Funds will be transferred to"
@@ -1330,16 +1344,16 @@ msgstr "通过添加您的第一个开始。"
msgid "Getting fee levels..."
msgstr "正在获取收费水平..."
+#: www/views/buyAmazon.html:43
+#: www/views/buyMercadoLibre.html:42
+msgid "Gift Card"
+msgstr ""
+
#: www/views/modals/mercadolibre-card-details.html:30
#: www/views/modals/mercadolibre-card-details.html:35
msgid "Gift Card is not available to use anymore"
msgstr "礼品卡不可再使用"
-#: www/views/buyAmazon.html:43
-#: www/views/buyMercadoLibre.html:42
-msgid "Gift card"
-msgstr "礼品卡"
-
#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "礼品卡过期"
@@ -1350,18 +1364,20 @@ msgstr "礼品卡生成并准备使用。"
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
+#: src/js/controllers/cashScan.js:20
#: src/js/controllers/onboarding/terms.js:23
#: src/js/controllers/preferences.js:67
#: src/js/controllers/preferencesAbout.js:16
#: src/js/controllers/preferencesCash.js:34
#: src/js/controllers/preferencesLanguage.js:14
#: src/js/controllers/tab-home.js:149
-#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tab-settings.js:53
#: src/js/controllers/tx-details.js:193
#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "返回 #"
+#: src/js/controllers/confirm.js:131
#: src/js/controllers/onboarding/backupRequest.js:20
#: src/js/controllers/onboarding/backupRequest.js:26
#: src/js/services/bitpayAccountService.js:84
@@ -1390,16 +1406,16 @@ msgstr "硬件钱包"
#: src/js/controllers/create.js:180
#: src/js/controllers/join.js:145
msgid "Hardware wallets are not yet supported with Bitcoin Cash"
-msgstr ""
+msgstr "硬體錢包不支持小比特幣"
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "帮助与支持"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:50
+#: src/js/controllers/tab-settings.js:51
msgid "Help and support information is available at the website."
-msgstr "帮助&支持现在是可用的"
+msgstr "此網站提供幫助及支援資訊"
#: www/views/addresses.html:25
msgid "Hide"
@@ -1476,7 +1492,7 @@ msgstr "我明白是否这个应用程序是搬到另一个设备或删除，我
msgid "I understand that my funds are held securely on this device, not by a company."
msgstr "我明白，我的资金安全地在此设备上，不由公司举行。"
-#: www/views/backup.html:29
+#: www/views/backup.html:36
msgid "I've written it down"
msgstr "我已经把它写下来"
@@ -1525,7 +1541,7 @@ msgstr "导入钱包"
msgid "Importing Wallet..."
msgstr "正在导入钱包..."
-#: www/views/backup.html:65
+#: www/views/backup.html:72
msgid "In order to verify your wallet backup, please type your password."
msgstr "为了验证您的钱包的备份，请键入您的密码。"
@@ -1534,10 +1550,10 @@ msgstr "为了验证您的钱包的备份，请键入您的密码。"
msgid "Inactive"
msgstr "处于非活动状态"
-#: www/views/includes/walletItem.html:11
-#: www/views/includes/walletSelector.html:18
-#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:122
+#: www/views/includes/walletItem.html:9
+#: www/views/includes/walletList.html:6
+#: www/views/includes/walletListSettings.html:9
+#: www/views/includes/walletSelector.html:16
msgid "Incomplete"
msgstr "不完整"
@@ -1559,7 +1575,7 @@ msgid "Incorrect network address"
msgstr "网络地址不正确"
#: src/js/controllers/confirm.js:114
-#: src/js/controllers/confirm.js:285
+#: src/js/controllers/confirm.js:306
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "资金不足"
@@ -1570,6 +1586,10 @@ msgstr "资金不足"
msgid "Insufficient funds for fee"
msgstr "费用的资金不足"
+#: www/views/tab-settings.html:123
+msgid "Integrations"
+msgstr ""
+
#: www/views/includes/walletHistory.html:49
msgid "Invalid"
msgstr "无效"
@@ -1613,7 +1633,7 @@ msgstr "发票过期"
msgid "Is there anything we could do better?"
msgstr "有什么我们可以做得更好吗？"
-#: www/views/backup.html:47
+#: www/views/backup.html:54
msgid "Is this correct?"
msgstr "这是正确的吗？"
@@ -1663,13 +1683,14 @@ msgstr "语言"
msgid "Last Month"
msgstr "上个月"
+#: src/js/controllers/confirm.js:132
#: www/views/preferences.html:48
#: www/views/preferencesCash.html:18
-#: www/views/tx-details.html:96
+#: www/views/tx-details.html:94
msgid "Learn more"
-msgstr ""
+msgstr "更多資訊"
-#: www/views/backup.html:36
+#: www/views/backup.html:43
msgid "Let's verify your backup phrase."
msgstr "让我们验证您备份的短语。"
@@ -1741,8 +1762,8 @@ msgstr "咩-没关系"
#: src/js/controllers/tx-details.js:165
#: www/views/modals/paypro.html:48
-#: www/views/modals/txp-details.html:95
-#: www/views/tx-details.html:74
+#: www/views/modals/txp-details.html:93
+#: www/views/tx-details.html:72
msgid "Memo"
msgstr "便签"
@@ -1752,9 +1773,9 @@ msgstr "梅尔卡多里弗巴西礼品卡"
#: src/js/controllers/buyMercadoLibre.js:98
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
-msgstr "就在这时，自由市场礼品卡服务不可用。请稍后再试。"
+msgstr "馬卡杜勒比禮品卡服務現時未能使用，請稍後再試"
-#: www/views/modals/txp-details.html:133
+#: www/views/modals/txp-details.html:131
msgid "Merchant Message"
msgstr "商人的消息"
@@ -1762,7 +1783,7 @@ msgstr "商人的消息"
#: www/views/buyMercadoLibre.html:54
#: www/views/topup.html:63
msgid "Miner Fee"
-msgstr ""
+msgstr "礦工費用"
#: src/js/services/bwcError.js:134
msgid "Missing parameter"
@@ -1805,7 +1826,7 @@ msgstr "名称"
#: www/views/buyMercadoLibre.html:48
#: www/views/topup.html:56
msgid "Network Cost"
-msgstr ""
+msgstr "網路支援成本"
#: src/js/services/bwcError.js:47
msgid "Network error"
@@ -1888,17 +1909,21 @@ msgstr "没有选定的钱包"
msgid "No wallets available"
msgstr "没有可用的钱包"
-#: www/views/paperWallet.html:47
+#: www/views/paperWallet.html:45
msgid "No wallets available to receive funds"
msgstr "没有可用于接收资金的钱包"
-#: www/views/cashScan.html:14
+#: www/views/cashScan.html:15
msgid "No wallets eligible for Bitcoin Cash support"
-msgstr ""
+msgstr "没有錢包合乎支持小比特幣資格"
-#: www/views/cashScan.html:44
+#: src/js/controllers/cashScan.js:58
+msgid "Non BIP44 wallet"
+msgstr "非BIP44錢包"
+
+#: www/views/cashScan.html:46
msgid "Non eligible BTC wallets"
-msgstr ""
+msgstr "非合格比特幣錢包"
#: src/js/services/feeService.js:12
msgid "Normal"
@@ -1908,7 +1933,7 @@ msgstr "常规"
msgid "Not authorized"
msgstr "尚未授权"
-#: src/js/controllers/confirm.js:286
+#: src/js/controllers/confirm.js:307
msgid "Not enough funds for fee"
msgstr "费用的资金不足"
@@ -1929,6 +1954,10 @@ msgstr "不是现在"
msgid "Note"
msgstr "备注"
+#: www/views/backup.html:19
+msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase."
+msgstr "注意: 如此比特幣錢包由小比特幣复制，他們共享相同恢復短語"
+
#: www/views/modals/wallets.html:25
msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "注意︰ 只有 1-1 （单签名） 钱包可以用于卖比特币"
@@ -1942,7 +1971,7 @@ msgstr "通知"
msgid "Notifications by email"
msgstr "用电子邮件通知"
-#: www/views/tx-details.html:119
+#: www/views/tx-details.html:117
msgid "Notify me if confirmed"
msgstr "确认完毕时通知我。"
@@ -1993,9 +2022,10 @@ msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr "在此屏幕上您可以看到您的钱包、 帐户和资产。"
#: src/js/controllers/bitpayCard.js:113
+#: src/js/controllers/cashScan.js:19
#: src/js/controllers/preferences.js:66
#: src/js/controllers/preferencesCash.js:33
-#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tab-settings.js:52
#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "打开"
@@ -2031,7 +2061,11 @@ msgstr "打开网站"
#: src/js/controllers/preferencesCash.js:32
msgid "Open bitcoincash.org?"
-msgstr ""
+msgstr "打開小比特幣網址bitcoincash.org?"
+
+#: src/js/controllers/cashScan.js:18
+msgid "Open the recovery tool."
+msgstr "打開恢復工具"
#: www/views/tab-receive.html:27
msgid "Open wallet"
@@ -2115,7 +2149,7 @@ msgid "Payment Rejected"
msgstr "支付被拒绝"
#: src/js/controllers/modals/txpDetails.js:44
-#: www/views/confirm.html:126
+#: www/views/confirm.html:124
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
msgid "Payment Sent"
@@ -2131,9 +2165,9 @@ msgstr "支付以被接受。它将由 Glidera 广播。如果出现问题，它
#: src/js/services/incomingData.js:152
msgid "Payment address was translated to new Bitcoin Cash address format:"
-msgstr ""
+msgstr "付款地址转化为新的小比特幣地址格式"
-#: www/views/modals/txp-details.html:109
+#: www/views/modals/txp-details.html:107
msgid "Payment details"
msgstr "支付明细"
@@ -2154,11 +2188,11 @@ msgstr "支付提议"
msgid "Permanently delete this wallet."
msgstr "永久删除这个钱包。"
-#: src/js/services/profileService.js:401
+#: src/js/services/profileService.js:403
msgid "Personal Wallet"
msgstr "个人钱包"
-#: www/views/backup.html:18
+#: www/views/backup.html:25
msgid "Please carefully write down this phrase."
msgstr "请仔细记下这句话。"
@@ -2166,7 +2200,7 @@ msgstr "请仔细记下这句话。"
msgid "Please connect a camera to get started."
msgstr "请连接相机入门。"
-#: src/js/controllers/import.js:277
+#: src/js/controllers/import.js:278
msgid "Please enter the recovery phrase"
msgstr "请输入恢复短语"
@@ -2179,7 +2213,7 @@ msgstr "请输入钱包恢复短语"
msgid "Please enter your PIN"
msgstr "请输入你的PIN码"
-#: www/views/backup.html:46
+#: www/views/backup.html:53
msgid "Please tap each word in the correct order."
msgstr "请点击每个单词按照正确的顺序。"
@@ -2190,7 +2224,7 @@ msgstr "请升级 Copay 以执行此操作"
#: www/views/walletDetails.html:142
#: www/views/walletDetails.html:62
msgid "Please wait"
-msgstr ""
+msgstr "請等等"
#: src/js/controllers/import.js:238
msgid "Please, select your backup file"
@@ -2212,7 +2246,7 @@ msgstr "正在准备地址..."
msgid "Preparing backup..."
msgstr "正在准备备份..."
-#: src/js/routes.js:1261
+#: src/js/routes.js:1264
msgid "Press again to exit"
msgstr "再按一次退出"
@@ -2238,7 +2272,7 @@ msgstr "提案被接受"
#: src/js/controllers/modals/txpDetails.js:61
#: src/js/controllers/tx-details.js:78
-#: www/views/confirm.html:127
+#: www/views/confirm.html:125
msgid "Proposal Created"
msgstr "建议创建"
@@ -2298,14 +2332,18 @@ msgstr "阅读更多"
#: src/js/controllers/preferences.js:65
#: src/js/controllers/tx-details.js:54
msgid "Read more in our Wiki"
-msgstr ""
+msgstr "去我們的維基閱讀更多"
+
+#: src/js/controllers/cashScan.js:61
+msgid "Read only wallet"
+msgstr "錢包只供唯讀"
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
msgstr "接收"
-#: www/views/customAmount.html:46
+#: www/views/customAmount.html:44
msgid "Receive in"
msgstr "在接收"
@@ -2463,17 +2501,17 @@ msgstr "重新扫描"
msgid "Scan your fingerprint please"
msgstr "请扫描你的指纹"
-#: www/views/preferencesCash.html:22
+#: www/views/preferencesCash.html:23
msgid "Scan your wallets for Bitcoin Cash"
-msgstr ""
+msgstr "掃描你的錢包以存取小比特幣"
#: src/js/services/onGoingProcess.js:30
msgid "Scanning Wallet funds..."
msgstr "正在扫描钱包资金..."
-#: www/views/tab-home.html:95
+#: www/views/includes/walletList.html:11
msgid "Scanning funds..."
-msgstr ""
+msgstr "掃描資金中....."
#: www/views/includes/screenshotWarningModal.html:7
msgid "Screenshots are not secure"
@@ -2544,7 +2582,7 @@ msgstr "通过电邮发送地址"
msgid "Send by email"
msgstr "通过电邮发送"
-#: src/js/controllers/confirm.js:156
+#: src/js/controllers/confirm.js:177
msgid "Send from"
msgstr "从发送"
@@ -2583,7 +2621,7 @@ msgstr "发送的最大金额"
msgid "Sending transaction"
msgstr "正在发送交易"
-#: src/js/controllers/confirm.js:524
+#: src/js/controllers/confirm.js:545
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "从你的 {{name}} 钱包发送 {{amountStr}}"
@@ -2698,24 +2736,27 @@ msgstr "单一地址钱包"
msgid "Skip"
msgstr "跳过"
-#: src/js/controllers/confirm.js:350
+#: src/js/controllers/confirm.js:371
#: src/js/controllers/modals/txpDetails.js:47
msgid "Slide to accept"
-msgstr ""
+msgstr "在此點擊掃描以接受"
#: www/views/buyAmazon.html:96
-#: www/views/buyMercadoLibre.html:83
msgid "Slide to buy"
msgstr "滑动购买"
-#: src/js/controllers/confirm.js:344
+#: src/js/controllers/confirm.js:365
msgid "Slide to pay"
-msgstr ""
+msgstr "在此點擊掃描以付款"
-#: src/js/controllers/confirm.js:356
+#: src/js/controllers/confirm.js:377
#: src/js/controllers/modals/txpDetails.js:40
msgid "Slide to send"
-msgstr ""
+msgstr "在此點擊滑動以發送"
+
+#: www/views/cashScan.html:56
+msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the"
+msgstr "你有些錢包不合資格得到小比特幣的支持可嘗試連結這些錢包至BCH基金"
#: src/js/controllers/create.js:88
#: src/js/controllers/join.js:71
@@ -2761,7 +2802,7 @@ msgstr "超级经济"
#: www/views/preferencesCash.html:11
msgid "Support Bitcoin Cash"
-msgstr ""
+msgstr "支持小比特幣"
#: www/views/paperWallet.html:7
msgid "Sweep"
@@ -2791,7 +2832,7 @@ msgstr "点击并按住以显示"
#: www/views/includes/walletInfo.html:3
msgid "Tap to recreate"
-msgstr ""
+msgstr "點擊此以重新創建"
#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
@@ -2934,7 +2975,7 @@ msgstr "这个应用程序太棒了 ！"
msgid "This app stores your bitcoin with cutting-edge security."
msgstr "此应用程序商店你比特币与尖端的安全。"
-#: src/js/controllers/confirm.js:502
+#: src/js/controllers/confirm.js:523
msgid "This bitcoin payment request has expired."
msgstr "这比特币付款请求已过期。"
@@ -2944,15 +2985,15 @@ msgstr "这比特币付款请求已过期。"
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "此密码将无法恢复。如果密码丢失，有是没有办法，你可以恢复您的资金。"
-#: www/views/backup.html:24
+#: www/views/backup.html:31
msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed."
msgstr "此恢复短语是用密码创建。为了恢复此钱包，需要恢复短语和密码。"
-#: www/views/tx-details.html:93
+#: www/views/tx-details.html:91
msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself."
msgstr "相对于当前比特币网络费，这笔交易金额太小。手续费相当于这笔交易金额本身。"
-#: www/views/tx-details.html:89
+#: www/views/tx-details.html:87
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "这笔交易可能需要很长的时间来确认或可能受到由发件人设置的低费用下降"
@@ -2961,14 +3002,14 @@ msgstr "这笔交易可能需要很长的时间来确认或可能受到由发件
msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
msgstr "此钱包不在给定的 Bitcore Wallet Service (BWS) 注册。你可以从本地信息重新创建它。"
-#: www/views/modals/txp-details.html:138
-#: www/views/tx-details.html:123
+#: www/views/modals/txp-details.html:136
+#: www/views/tx-details.html:121
msgid "Timeline"
msgstr "时间轴"
#: www/views/confirm.html:31
#: www/views/includes/output.html:2
-#: www/views/modals/txp-details.html:111
+#: www/views/modals/txp-details.html:109
#: www/views/modals/txp-details.html:53
#: www/views/tx-details.html:41
#: www/views/tx-details.html:53
@@ -3023,7 +3064,7 @@ msgstr "触摸 ID 失败"
msgid "Transaction"
msgstr "交易"
-#: www/views/confirm.html:128
+#: www/views/confirm.html:126
msgid "Transaction Created"
msgstr "交易记录已创建"
@@ -3083,7 +3124,7 @@ msgstr "键入恢复短语 （通常 12 个字）"
msgid "Uh oh..."
msgstr "哦哦......"
-#: www/views/tx-details.html:102
+#: www/views/tx-details.html:100
msgid "Unconfirmed"
msgstr "未确认"
@@ -3157,7 +3198,7 @@ msgstr "查看交易记录的洞察"
msgid "View Update"
msgstr "查看更新"
-#: www/views/tx-details.html:149
+#: www/views/tx-details.html:147
msgid "View on blockchain"
msgstr "在 blockchain 上查看"
@@ -3277,7 +3318,7 @@ msgstr "钱包类型"
msgid "Wallet already exists"
msgstr "钱包已存在"
-#: src/js/services/profileService.js:515
+#: src/js/services/profileService.js:516
msgid "Wallet already in {{appName}}"
msgstr "已经在 {{appName}} 的钱包"
@@ -3319,8 +3360,8 @@ msgstr "未备份的钱包"
msgid "Wallet not found"
msgstr "找不到钱包"
-#: src/js/controllers/cashScan.js:65
-#: src/js/controllers/tab-home.js:220
+#: src/js/controllers/cashScan.js:81
+#: src/js/controllers/tab-home.js:230
msgid "Wallet not registered"
msgstr "未注册的钱包"
@@ -3328,9 +3369,9 @@ msgstr "未注册的钱包"
msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase"
msgstr "钱包不在 Wallet Service 注册。使用“创建钱包\"的\"高级选项\"设置你的恢复短语以重新创建它"
-#: www/views/backup.html:11
-msgid "Wallet recovery phrase not available."
-msgstr "钱包恢复短语不可用。"
+#: www/views/backup.html:12
+msgid "Wallet recovery phrase not available"
+msgstr "錢包恢復短語不存在"
#: src/js/services/bwcError.js:50
msgid "Wallet service not found"
@@ -3340,11 +3381,7 @@ msgstr "找不到 Wallet Service"
msgid "Wallets"
msgstr "钱包"
-#: www/views/tab-settings.html:107
-msgid "Wallets & Integrations"
-msgstr "钱包 & 集成"
-
-#: src/js/controllers/addressbookView.js:23
+#: src/js/controllers/addressbookView.js:36
#: src/js/controllers/modals/txpDetails.js:153
#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
@@ -3365,7 +3402,7 @@ msgstr "小心 ！"
msgid "We'd love to do better."
msgstr "我们很乐意做得更好。"
-#: www/views/backup.html:28
+#: www/views/backup.html:35
msgid "We'll confirm on the next screen."
msgstr "我们会在下一个屏幕上确认。"
@@ -3409,7 +3446,7 @@ msgstr "你会愿意率 {{appName}} app store 中的吗？"
msgid "Would you like to receive push notifications about payments?"
msgstr "你想收到推式通知有关付款吗？"
-#: src/js/controllers/import.js:287
+#: src/js/controllers/import.js:288
msgid "Wrong number of recovery words:"
msgstr "恢复词句数不正确："
@@ -3445,7 +3482,7 @@ msgstr "你可以看到最新的事态发展和贡献这个开放源码应用程
msgid "You can spend bitcoin at millions of websites and stores worldwide."
msgstr "你可以花比特币在数以百万计的网站和世界各地的商店。"
-#: www/views/backup.html:12
+#: www/views/backup.html:15
msgid "You can still export it from Advanced > Export."
msgstr "你仍然可以将其导出从高级 > 出口。"
@@ -3523,10 +3560,10 @@ msgstr "你的钱包是永远不会保存到云存储或标准设备备份。"
msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down."
msgstr "你的钱包钥匙将被加密。支付密码不能恢复。必须把它抄写下来"
-#: www/views/includes/walletSelector.html:23
-#: www/views/paperWallet.html:35
-#: www/views/tab-home.html:97
-#: www/views/tab-receive.html:74
+#: www/views/includes/walletList.html:13
+#: www/views/includes/walletSelector.html:21
+#: www/views/paperWallet.html:33
+#: www/views/tab-receive.html:72
#: www/views/walletDetails.html:131
#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
@@ -3535,7 +3572,7 @@ msgstr "[隐藏余额]"
#: www/views/walletDetails.html:141
#: www/views/walletDetails.html:61
msgid "[Scanning Funds]"
-msgstr ""
+msgstr "[正在掃描資金]"
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
@@ -3545,7 +3582,7 @@ msgstr "添加您的 BitPay 签证卡"
msgid "locked by pending payments"
msgstr "被未决支付锁定"
-#: src/js/services/profileService.js:402
+#: src/js/services/profileService.js:404
msgid "me"
msgstr "我"
@@ -3557,6 +3594,10 @@ msgstr "name@example.com"
msgid "preparing..."
msgstr "准备中..."
+#: www/views/cashScan.html:57
+msgid "recovery tool."
+msgstr "恢復工具"
+
#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} 为亚马逊礼品卡的"
@@ -3569,11 +3610,11 @@ msgstr "梅尔卡多里弗巴西礼品卡 {{amountStr}}"
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:387
+#: src/js/controllers/confirm.js:408
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} 将比特币网络费用中扣除。"
-#: www/views/confirm.html:87
+#: www/views/confirm.html:85
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "发送量 {{tx.txp[wallet.id].feeRatePerStr}}"
@@ -3581,7 +3622,7 @@ msgstr "发送量 {{tx.txp[wallet.id].feeRatePerStr}}"
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "下载的 {{updatingTxHistoryProgress}} 交易"
-#: www/views/cashScan.html:32
+#: www/views/cashScan.html:33
#: www/views/copayers.html:46
#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"