diff --git a/i18n/po/de.po b/i18n/po/de.po
index ae6867cb7..6c9d3b541 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-08-16 09:23-0400\n"
+"PO-Revision-Date: 2017-09-19 14:07-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -48,31 +48,31 @@ 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:351
+#: src/js/controllers/confirm.js:380
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:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "Über"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "Akzeptiert"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "Benutzerkonto"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "Kontonummer"
@@ -106,9 +106,9 @@ msgstr "Guthaben aufladen"
msgid "Add Memo"
msgstr "Notiz hinzufügen"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "Passwort festlegen"
@@ -116,9 +116,9 @@ msgstr "Passwort festlegen"
msgid "Add account"
msgstr "Konto hinzufügen"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "Ein optionales Passwort zur Sicherung der Wiederherstellungsphrase 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:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "Beschreibung hinzufügen"
@@ -153,7 +153,7 @@ msgstr "Adresse"
msgid "Address Book"
msgstr "Addressbuch"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "Adresstyp"
@@ -161,7 +161,7 @@ msgstr "Adresstyp"
msgid "Addresses With Balance"
msgstr "Adressen mit Guthaben"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "Erweitert"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "Fast fertig! Fassen wir zusammen."
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "Alternative Währung"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr ""
@@ -216,7 +216,7 @@ msgstr "Betrag"
msgid "Amount below minimum allowed"
msgstr "Betrag unter zulässigem Minimum"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "Betrag zu hoch"
@@ -256,11 +256,11 @@ msgstr ""
msgid "Are you sure you want to delete this wallet?"
msgstr "Soll das Wallet wirklich gelöscht werden?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "Wollen Sie wirklich diese Transaktion ablehnen?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "Wollen Sie wirklich diese Transaktion löschen?"
@@ -277,7 +277,7 @@ msgstr ""
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "Sind Sie sicher, dass Sie Ihre BitPay-Karte ({{lastFourDigits}}) von diesem Gerät entfernen möchten?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "Prüffähig"
@@ -294,13 +294,17 @@ msgstr "Verfügbarer Gesamtbetrag"
msgid "Average confirmation time"
msgstr "Durchschnittliche Bestätigungzeit"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "BIP32 Pfad für die Adressen-Ableitung"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr ""
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "Sicherung"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "Sichern Sie alle Livenet Wallets, bevor Sie diese Funktion nutzen"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Backup benötigt"
@@ -331,11 +335,11 @@ 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:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "Ungültige Einladung"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "Guthaben nach Adresse"
@@ -352,15 +356,24 @@ msgstr "BitPay Visa® Karten"
msgid "Bitcoin Address"
msgstr "Bitcoin-Adresse"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr ""
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Bitcoin-Netzwerk Gebührenübersicht"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Bitcoin-Einheit"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr ""
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -386,8 +399,8 @@ msgstr ""
msgid "Broadcast Payment"
msgstr "Zahlung übermitteln"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "Gesendet"
@@ -417,7 +430,7 @@ msgstr "Kaufe Bitcoins"
msgid "Buy a Gift Card"
msgstr ""
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
msgstr ""
@@ -429,10 +442,11 @@ msgstr "Kaufe Bitcoins..."
msgid "Calculating fee"
msgstr "Mining-Fee Berechnung"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr ""
msgid "Cannot Create Wallet"
msgstr "Wallet kann nicht erstellt werden"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "An einem Wallet kann nicht mehrfach teilgenommen werden"
@@ -491,9 +505,19 @@ msgstr "Leeren"
msgid "Clear cache"
msgstr "Cache leeren"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "Klick"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr ""
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr ""
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr ""
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "Klick"
msgid "Close"
msgstr "Schließen"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr ""
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "Farbe"
@@ -513,7 +542,7 @@ msgstr "Farbe"
msgid "Commit hash"
msgstr "Hash übertragen"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "Beenden Sie den Backupvorgang um diese Option zu nutzen"
@@ -521,11 +550,11 @@ msgstr "Beenden Sie den Backupvorgang um diese Option zu nutzen"
msgid "Completed"
msgstr ""
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -547,11 +576,11 @@ msgstr ""
msgid "Confirm your PIN"
msgstr "PIN bestätigen"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "Bestätigen Sie Ihr neues Passwort"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "Bestätigungen"
@@ -604,7 +633,7 @@ msgstr "Copayer Datenkonflikt"
msgid "Copayer joined"
msgstr "Copayer beigetreten"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Copayer {{$index}}"
@@ -626,7 +655,7 @@ msgstr "Diesen Text an einem sichern Ort einfügen (Notepad oder E-Mail)"
msgid "Copy to clipboard"
msgstr "In die Zwischenablage kopieren"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
msgstr ""
@@ -634,19 +663,19 @@ msgstr ""
msgid "Could not access the wallet at the server. Please check:"
msgstr "Kein Zugriff auf Wallet des Servers. Überprüfen Sie bitte:"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr ""
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "Auf Wallet konnte nicht zugegriffen werden"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Nachricht kann nicht an die importierte Wallet hinzugefügt werden ohne einem gemeinsamen Verschlüsselungsschlüssel"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "Zahlung konnte nicht gesendet werden"
@@ -654,45 +683,49 @@ msgstr "Zahlung konnte nicht gesendet werden"
msgid "Could not build transaction"
msgstr "Transaktion konnte nicht erstellt werden"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "Adresse konnte nicht erstellt werden"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr ""
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr ""
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
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:353
+#: src/js/services/profileService.js:363
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:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Wallet-Wiederherstellungsphrase nicht gültig"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "Datei konnte nicht entschlüsselt werden, bitte das Passwort überprüfen"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "Zahlungsvorschlag konnte nicht gelöscht werden"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr ""
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "Dynamische Gebühr konnten nicht abgerufen werden"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "Dynamische Gebühr für den Level konnte nicht abgerufen werden: {{feeLevel}}"
@@ -700,9 +733,9 @@ msgstr "Dynamische Gebühr für den Level konnte nicht abgerufen werden: {{feeLe
msgid "Could not get fee levels"
msgstr ""
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr ""
@@ -710,21 +743,21 @@ msgstr ""
msgid "Could not get transactions"
msgstr "Transaktionen konnten nicht gefunden werden"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "Import nicht möglich"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
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:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "Beteiligung am Wallet nicht möglich"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "Zahlung konnte nicht abgelehnt werden"
@@ -741,22 +774,22 @@ msgstr "Karte konnte nicht gelöscht werden"
msgid "Could not save preferences on the server"
msgstr "Die Einstellungen konnten nicht am Server gespeichert werden"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "Zahlung kann nicht gesendet werden"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr ""
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "Die Transaktionshistorie konnte nicht aktualisiert werden"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "Erstelle eine gemeinsame Wallet"
msgid "Create bitcoin wallet"
msgstr "Erstelle Bitcoin-Wallet"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "Neues Wallet erzeugen"
@@ -784,7 +817,7 @@ msgstr "Neues Wallet erzeugen"
msgid "Create shared wallet"
msgstr "Erstelle gemeinsame Wallet"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Ein {{formData.requiredCopayers}}-von-{{formData.totalCopayers}} Wallet erzeugen"
@@ -814,7 +847,7 @@ msgstr ""
msgid "Custom Amount"
msgstr "Benutzerdefinierter Betrag"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr ""
@@ -849,14 +882,14 @@ msgstr "Wallet wird gelöscht..."
msgid "Deleting payment proposal"
msgstr "Lösche Zahlungsvorschlag"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "Ableitungsstruktur"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "Ableitungstrategie"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr ""
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Deaktiviert"
@@ -890,6 +924,14 @@ msgstr "Wird deine Sprache auf Crowdin nicht angezeigt? Kontaktiere den Support
msgid "Download"
msgstr "Herunterladen"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr ""
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+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."
msgstr "Jede Bitcoin-Wallet kann Milliarden von Adressen aus Ihrem 12-Wort Backup erzeugen. Jedesmal wenn Sie eine Zahlung erhalten wird neue Adresse automatisch generiert und dargestellten."
@@ -915,6 +957,10 @@ msgstr "E-Mail Adresse"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "Obergrenze für leere Adressen erreicht. Neue Adressen können nicht generiert werden."
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr ""
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "Aktiviere den Kamerazugriff in Ihren Geräteeinstellungen."
@@ -931,8 +977,12 @@ msgstr "Pushbenachrichtigungen aktivieren"
msgid "Enable the camera to get started."
msgstr "Aktivieren Sie die Kamera um loszulegen."
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr ""
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "Berechtigungscode eingeben"
@@ -948,13 +998,13 @@ msgstr ""
msgid "Enter custom fee"
msgstr ""
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "Neuen Berechtigungscode eingeben"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "Wiederherstellungsphrase eingeben (BIP39)"
@@ -970,23 +1020,24 @@ msgstr "Passwort eingeben"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "Passwort eingeben"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "Fehler"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "Fehler beim bestätigen"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
msgstr ""
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr ""
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "Fehler beim Erstellen des Wallets"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr ""
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr ""
@@ -1076,7 +1130,7 @@ msgstr ""
msgid "Error scanning funds:"
msgstr "Fehler beim Ermitteln des Guthaben:"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "Fehler beim Leeren der Wallet:"
@@ -1088,7 +1142,7 @@ msgstr "Fehler beim Aktualisieren der Debitkarten"
msgid "Exceeded daily limit of $500 per user"
msgstr "Tageslimit von $500 pro Benutzer überschritten"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,12 +1168,12 @@ msgstr "In eine Datei exportieren"
msgid "Export wallet"
msgstr "Wallet exportieren"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "Für diese Wallet ist Export per QR nicht unterstützt"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "Erweiterte öffentliche Schlüssel"
@@ -1188,12 +1242,12 @@ msgstr "Abtasten des Fingerabdrucks gescheitert"
msgid "Finish"
msgstr "Beenden"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "Zur Kontrolle"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "Von"
msgid "From BitPay account"
msgstr "Von BitPay Konto"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr ""
@@ -1286,7 +1340,7 @@ msgstr ""
msgid "Gift card"
msgstr ""
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr ""
@@ -1297,11 +1351,14 @@ msgstr ""
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: 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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Zurück"
@@ -1317,8 +1374,8 @@ msgstr "Zurück"
msgid "Got it"
msgstr "Habe verstanden"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "Hardware-Wallet"
@@ -1330,12 +1387,17 @@ msgstr "Hardware nicht verbunden."
msgid "Hardware wallet"
msgstr "Hardware-Wallet"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr ""
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Hilfe & Support"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "Hilfe und Support-Informationen gibt es auf der Website."
@@ -1347,17 +1409,17 @@ msgstr "Verstecken"
msgid "Hide Balance"
msgstr "Guthaben Verstecken"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "Nächste Schritte der Karte ausblenden"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "Erweiterte Optionen ausblenden"
@@ -1387,9 +1449,9 @@ msgstr "Ich habe die Nutzungsbedingun
msgid "I have read, understood, and agree with the Terms of use."
msgstr "Ich habe die Nutzungsbedingungen gelesen und stimme ihnen zu."
-#: www/views/join.html:134
-#: www/views/tab-create-personal.html:105
-#: www/views/tab-create-shared.html:134
+#: www/views/join.html:137
+#: www/views/tab-create-personal.html:107
+#: www/views/tab-create-shared.html:136
msgid "I have written it down"
msgstr "Ich habe es aufgeschrieben"
@@ -1422,11 +1484,11 @@ msgstr "Ich habe es aufgeschrieben"
msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected."
msgstr "Wenn aktiviert, werden alle vertraulichen Informationen (private Schlüssel und Wiederherstellungs Satz) und die zugeordneten Aktionen (Ausgaben und Exporte) des Wallets geschützt."
-#: www/views/advancedSettings.html:22
+#: www/views/advancedSettings.html:23
msgid "If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab."
msgstr "Wenn aktiviert wird die \"Kürzlich Ausgeführte Transaktionen\" Karte - eine Liste von Transaktionen aller Wallets - in der Registerkarte \"Start\" erscheinen."
-#: www/views/advancedSettings.html:13
+#: www/views/advancedSettings.html:14
msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays."
msgstr "Wenn aktiviert werden Wallets auch versuchen unbestätigtes Vermögen auszugeben. Diese Option kann zu Transaktionsverzögerungen führen."
@@ -1443,7 +1505,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca
msgstr "Wenn Sie einen Screenshot erstellen, kann die Sicherung von anderen Apps angesehen werden. Sie können ein sicheres Backup mit Papier und Stift erstellen."
#: www/views/tab-import-hardware.html:42
-#: www/views/tab-import-phrase.html:77
+#: www/views/tab-import-phrase.html:80
msgid "Import"
msgstr "Import"
@@ -1451,7 +1513,7 @@ msgstr "Import"
msgid "Import Wallet"
msgstr "Wallet importieren"
-#: www/views/tab-import-file.html:39
+#: www/views/tab-import-file.html:41
msgid "Import backup"
msgstr "Importiere Sicherung"
@@ -1475,7 +1537,7 @@ msgstr ""
#: www/views/includes/walletItem.html:11
#: www/views/includes/walletSelector.html:18
#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:117
+#: www/views/tab-settings.html:122
msgid "Incomplete"
msgstr "Unvollständig"
@@ -1488,7 +1550,7 @@ msgid "Incorrect PIN, try again."
msgstr "Falscher PIN, bitte erneut versuchen."
#. Trying to import a malformed wallet export QR code
-#: src/js/controllers/import.js:70
+#: src/js/controllers/import.js:85
msgid "Incorrect code format"
msgstr "QR code hat falsches Format"
@@ -1496,14 +1558,14 @@ msgstr "QR code hat falsches Format"
msgid "Incorrect network address"
msgstr ""
-#: src/js/controllers/confirm.js:112
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:114
+#: src/js/controllers/confirm.js:285
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "Nicht ausreichendes Guthaben"
-#: src/js/controllers/topup.js:164
-#: src/js/controllers/topup.js:176
+#: src/js/controllers/topup.js:165
+#: src/js/controllers/topup.js:177
#: src/js/services/bwcError.js:71
msgid "Insufficient funds for fee"
msgstr "Nicht ausreichendes Guthaben für die Gebühr"
@@ -1512,15 +1574,15 @@ msgstr "Nicht ausreichendes Guthaben für die Gebühr"
msgid "Invalid"
msgstr "Ungültig"
-#: src/js/controllers/buyAmazon.js:136
-#: src/js/controllers/buyMercadoLibre.js:136
-#: src/js/controllers/topup.js:114
+#: src/js/controllers/buyAmazon.js:137
+#: src/js/controllers/buyMercadoLibre.js:137
+#: src/js/controllers/topup.js:115
msgid "Invalid URL"
msgstr ""
-#: src/js/controllers/create.js:175
-#: src/js/controllers/import.js:327
-#: src/js/controllers/join.js:142
+#: src/js/controllers/create.js:186
+#: src/js/controllers/import.js:345
+#: src/js/controllers/join.js:151
msgid "Invalid account number"
msgstr "Ungültige Kontonummer"
@@ -1532,9 +1594,9 @@ msgstr "Ungültige Adresse"
msgid "Invalid data"
msgstr "Ungültige Daten"
-#: src/js/controllers/create.js:155
-#: src/js/controllers/import.js:249
-#: src/js/controllers/join.js:121
+#: src/js/controllers/create.js:161
+#: src/js/controllers/import.js:266
+#: src/js/controllers/join.js:125
msgid "Invalid derivation path"
msgstr "Ungültige Ableitungsstruktur"
@@ -1567,7 +1629,7 @@ msgstr "Es ist eine gute Idee Adressen nicht wiederzuverwenden - dies schützt I
msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again."
msgstr "Es ist wichtig dass Sie Ihre Wiederherstellungsphrase korrekt aufschreiben. Wenn etwas mit Ihrer Wallet passiert benötigen Sie diese Sicherung um Ihr Geld wiederherstellen zu können. Bitte überprüfen Sie Ihre Sicherung und versuchen Sie es erneut."
-#: www/views/join.html:148
+#: www/views/join.html:151
msgid "Join"
msgstr "Teilnehmen"
@@ -1593,7 +1655,7 @@ msgid "Key already associated with an existing wallet"
msgstr "Schlüssel ist bereits mit einem existierenden Wallet verbunden"
#: www/views/preferencesLanguage.html:4
-#: www/views/tab-settings.html:53
+#: www/views/tab-settings.html:68
msgid "Language"
msgstr "Sprache"
@@ -1601,6 +1663,12 @@ msgstr "Sprache"
msgid "Last Month"
msgstr "Letzter Monat"
+#: www/views/preferences.html:48
+#: www/views/preferencesCash.html:18
+#: www/views/tx-details.html:96
+msgid "Learn more"
+msgstr ""
+
#: www/views/backup.html:36
msgid "Let's verify your backup phrase."
msgstr "Überprüfen Sie Ihre Wiederherstellungsphrase."
@@ -1614,7 +1682,7 @@ msgstr "Lade Adressen..."
msgid "Loading transaction info..."
msgstr "Transaktionen werden geladen..."
-#: www/views/tab-settings.html:95
+#: www/views/tab-settings.html:100
msgid "Lock App"
msgstr "App sperren"
@@ -1663,7 +1731,7 @@ msgid "Matches:"
msgstr "Übereinstimmungen:"
#: www/views/includes/copayers.html:4
-#: www/views/preferencesInformation.html:79
+#: www/views/preferencesInformation.html:85
msgid "Me"
msgstr "Ich"
@@ -1671,7 +1739,7 @@ msgstr "Ich"
msgid "Meh - it's alright"
msgstr "Meh - ist in Ordnung"
-#: src/js/controllers/tx-details.js:148
+#: 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
@@ -1682,7 +1750,7 @@ msgstr "Notiz"
msgid "Mercado Livre Brazil Gift Cards"
msgstr ""
-#: src/js/controllers/buyMercadoLibre.js:97
+#: src/js/controllers/buyMercadoLibre.js:98
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr ""
@@ -1704,7 +1772,7 @@ msgstr "Angabe fehlt"
msgid "Missing private keys to sign"
msgstr "Zum Signieren fehlen die privaten Schlüssel"
-#: www/views/preferences.html:60
+#: www/views/preferences.html:61
#: www/views/preferencesAdvanced.html:3
msgid "More Options"
msgstr "Weitere Optionen"
@@ -1714,7 +1782,7 @@ msgstr "Weitere Optionen"
msgid "Moved"
msgstr "Verschoben"
-#: src/js/controllers/tx-details.js:114
+#: src/js/controllers/tx-details.js:131
msgid "Moved Funds"
msgstr "Guthaben verschoben"
@@ -1747,7 +1815,7 @@ msgstr "Netzwerkfehler"
msgid "New Proposal"
msgstr "Neuer Vorschlag"
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:126
msgid "New address could not be generated. Please try again."
msgstr "Neue Adresse konnte nicht erstellt werden. Bitte versuche es erneut."
@@ -1763,8 +1831,8 @@ msgstr "Nächste Schritte"
msgid "No Wallet"
msgstr "Keine Wallet"
-#: src/js/controllers/buyAmazon.js:114
-#: src/js/controllers/buyMercadoLibre.js:114
+#: src/js/controllers/buyAmazon.js:115
+#: src/js/controllers/buyMercadoLibre.js:115
msgid "No access key defined"
msgstr ""
@@ -1796,12 +1864,12 @@ msgstr "Keine ausstehenden Vorschläge"
msgid "No recent transactions"
msgstr "Keine aktuellen Transaktionen"
-#: src/js/controllers/buyAmazon.js:43
-#: src/js/controllers/topup.js:46
+#: src/js/controllers/buyAmazon.js:44
+#: src/js/controllers/topup.js:47
msgid "No signing proposal: No private key"
msgstr ""
-#: www/views/walletDetails.html:192
+#: www/views/walletDetails.html:204
msgid "No transactions yet"
msgstr "Noch keine Transaktionen"
@@ -1813,10 +1881,10 @@ msgstr "Kein Wallet gefunden"
msgid "No wallet selected"
msgstr "Kein Wallet ausgewählt"
-#: src/js/controllers/buyAmazon.js:298
-#: src/js/controllers/buyMercadoLibre.js:290
-#: src/js/controllers/confirm.js:83
-#: src/js/controllers/topup.js:263
+#: src/js/controllers/buyAmazon.js:300
+#: src/js/controllers/buyMercadoLibre.js:292
+#: src/js/controllers/confirm.js:85
+#: src/js/controllers/topup.js:265
msgid "No wallets available"
msgstr ""
@@ -1824,6 +1892,14 @@ msgstr ""
msgid "No wallets available to receive funds"
msgstr "Keine Wallet verfügbar um Guthaben zu erhalten"
+#: www/views/cashScan.html:14
+msgid "No wallets eligible for Bitcoin Cash support"
+msgstr ""
+
+#: www/views/cashScan.html:44
+msgid "Non eligible BTC wallets"
+msgstr ""
+
#: src/js/services/feeService.js:12
msgid "Normal"
msgstr "Normal"
@@ -1832,7 +1908,7 @@ msgstr "Normal"
msgid "Not authorized"
msgstr "Nicht berechtigt"
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/confirm.js:286
msgid "Not enough funds for fee"
msgstr "Das Guthaben reicht nicht für die Gebühr"
@@ -1858,7 +1934,7 @@ 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"
#: www/views/preferencesNotifications.html:3
-#: www/views/tab-settings.html:46
+#: www/views/tab-settings.html:61
msgid "Notifications"
msgstr "Benachrichtigungen"
@@ -1866,7 +1942,7 @@ msgstr "Benachrichtigungen"
msgid "Notifications by email"
msgstr ""
-#: www/views/tx-details.html:117
+#: www/views/tx-details.html:119
msgid "Notify me if confirmed"
msgstr ""
@@ -1882,8 +1958,9 @@ msgstr "Jetzt ist ein guter Zeitpunkt um Ihre Wallet zu sichern. Wenn das Gerät
msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?"
msgstr "Jetzt ist die perfekte Zeit um Ihre Umgebung zu überprüfen. In der Nähe eines Fensters? Versteckte Kameras? Schulter-Spione?"
-#: src/js/controllers/buyAmazon.js:310
-#: src/js/controllers/topup.js:284
+#: src/js/controllers/buyAmazon.js:312
+#: src/js/controllers/topup.js:286
+#: src/js/services/incomingData.js:153
#: src/js/services/popupService.js:16
#: src/js/services/popupService.js:52
#: src/js/services/popupService.js:61
@@ -1907,7 +1984,7 @@ msgstr "Offizieller englischer Haftungsausschluss"
msgid "Oh no!"
msgstr "Oh nein!"
-#: src/js/controllers/buyMercadoLibre.js:304
+#: src/js/controllers/buyMercadoLibre.js:306
msgid "Ok"
msgstr ""
@@ -1916,7 +1993,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/tab-settings.js:47
+#: src/js/controllers/preferences.js:66
+#: src/js/controllers/preferencesCash.js:33
+#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "Öffnen"
@@ -1933,7 +2013,7 @@ msgid "Open GitHub Project"
msgstr "Öffne GitHub Projekt"
#: src/js/controllers/bitpayCard.js:123
-#: src/js/controllers/tx-details.js:175
+#: src/js/controllers/tx-details.js:192
msgid "Open Insight"
msgstr "Öffne Insight"
@@ -1949,6 +2029,10 @@ msgstr "Öffne Übersetzungs-Community"
msgid "Open Website"
msgstr "Öffne Website"
+#: src/js/controllers/preferencesCash.js:32
+msgid "Open bitcoincash.org?"
+msgstr ""
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "Öffne Wallet"
@@ -1961,18 +2045,18 @@ msgstr ""
msgid "Order the BitPay Card"
msgstr "BitPay-Karte bestellen"
-#: www/views/join.html:102
-#: www/views/join.html:93
-#: www/views/tab-create-personal.html:67
-#: www/views/tab-create-personal.html:75
-#: www/views/tab-create-shared.html:104
-#: www/views/tab-create-shared.html:96
+#: www/views/join.html:105
+#: www/views/join.html:96
+#: www/views/tab-create-personal.html:69
+#: www/views/tab-create-personal.html:77
+#: www/views/tab-create-shared.html:106
+#: www/views/tab-create-shared.html:98
#: www/views/tab-import-file.html:18
-#: www/views/tab-import-phrase.html:38
+#: www/views/tab-import-phrase.html:41
msgid "Password"
msgstr "Passwort"
-#: src/js/controllers/import.js:83
+#: src/js/controllers/import.js:98
msgid "Password required. Make sure to enter your password in advanced options"
msgstr "Passwort erforderlich. Geben Sie Ihr Passwort in den erweiterten Optionen ein"
@@ -1992,7 +2076,7 @@ msgstr "Zahle 0 % Gebühren um Bitcoins in Dollar zu wechseln."
msgid "Pay To"
msgstr "Zahle an"
-#: src/js/controllers/modals/txpDetails.js:45
+#: src/js/controllers/modals/txpDetails.js:51
#: www/views/modals/tx-status.html:33
msgid "Payment Accepted"
msgstr "Zahlung angenommen"
@@ -2030,7 +2114,7 @@ msgstr "Zahlung erhalten"
msgid "Payment Rejected"
msgstr "Zahlung abgelehnt"
-#: src/js/controllers/modals/txpDetails.js:42
+#: src/js/controllers/modals/txpDetails.js:44
#: www/views/confirm.html:126
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
@@ -2045,6 +2129,10 @@ msgstr "Zahlung akzeptiert, aber noch nicht übermittelt"
msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created."
msgstr "Zahlung akzeptiert. Sie wird durch Glidera übermittelt. Falls ein Problem auftritt, kann sie nach einer Wartezeit von 6 Stunden gelöscht werden."
+#: src/js/services/incomingData.js:152
+msgid "Payment address was translated to new Bitcoin Cash address format:"
+msgstr ""
+
#: www/views/modals/txp-details.html:109
msgid "Payment details"
msgstr "Zahlungsdetails"
@@ -2066,7 +2154,7 @@ msgstr "Anstehende Vorschläge"
msgid "Permanently delete this wallet."
msgstr "Wallet dauerhaft löschen."
-#: src/js/services/profileService.js:388
+#: src/js/services/profileService.js:401
msgid "Personal Wallet"
msgstr "Persönliches Wallet"
@@ -2078,12 +2166,12 @@ msgstr "Notieren Sie bitte sorgfältig diese Phrase."
msgid "Please connect a camera to get started."
msgstr "Bitte verbinden Sie eine Kamera um loszulegen."
-#: src/js/controllers/import.js:260
+#: src/js/controllers/import.js:277
msgid "Please enter the recovery phrase"
msgstr "Bitte geben Sie die Wiederherstellungsphrase ein"
-#: src/js/controllers/create.js:168
-#: src/js/controllers/join.js:135
+#: src/js/controllers/create.js:174
+#: src/js/controllers/join.js:139
msgid "Please enter the wallet recovery phrase"
msgstr "Bitte geben Sie die Wallet-Wiederherstellungsphrase ein"
@@ -2099,7 +2187,12 @@ msgstr "Bitte tippen Sie jedes Wort in der richtigen Reihenfolge."
msgid "Please upgrade Copay to perform this action"
msgstr "Bitte Copay aktualisieren, um diese Aktion auszuführen"
-#: src/js/controllers/import.js:222
+#: www/views/walletDetails.html:142
+#: www/views/walletDetails.html:62
+msgid "Please wait"
+msgstr ""
+
+#: src/js/controllers/import.js:238
msgid "Please, select your backup file"
msgstr "Bitte die Sicherungsdatei wählen"
@@ -2119,7 +2212,7 @@ msgstr "Adressen werden vorbereitet..."
msgid "Preparing backup..."
msgstr "Sicherung wird vorbereitet..."
-#: src/js/routes.js:1240
+#: src/js/routes.js:1261
msgid "Press again to exit"
msgstr "Zum Beenden erneut drücken"
@@ -2131,7 +2224,7 @@ msgstr "höchste Priorität"
msgid "Private Key"
msgstr ""
-#: src/js/controllers/paperWallet.js:137
+#: src/js/controllers/paperWallet.js:136
msgid "Private key encrypted. Enter password"
msgstr "Privater Schlüssel verschlüsselt. Passwort eingeben"
@@ -2143,8 +2236,8 @@ msgstr "Der private Schlüssel ist verschlüsselt, signieren ist nicht möglich"
msgid "Proposal Accepted"
msgstr "Vorschlag angenommen"
-#: src/js/controllers/modals/txpDetails.js:55
-#: src/js/controllers/tx-details.js:61
+#: src/js/controllers/modals/txpDetails.js:61
+#: src/js/controllers/tx-details.js:78
#: www/views/confirm.html:127
msgid "Proposal Created"
msgstr "Vorschlag erstellt"
@@ -2157,15 +2250,15 @@ msgstr "Vorschlag gelöscht"
msgid "Proposal Rejected"
msgstr "Vorschlag abgelehnt"
-#: www/views/walletDetails.html:177
+#: www/views/walletDetails.html:189
msgid "Proposals"
msgstr "Vorschläge"
-#: src/js/controllers/buyAmazon.js:281
+#: src/js/controllers/buyAmazon.js:282
msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day"
msgstr ""
-#: src/js/controllers/buyMercadoLibre.js:280
+#: src/js/controllers/buyMercadoLibre.js:281
msgid "Purchase amount must be a value between 50 and 2000"
msgstr ""
@@ -2185,8 +2278,8 @@ msgstr "QR-Code"
msgid "Quick review!"
msgstr "Schnelle Überprüfung!"
-#: src/js/controllers/create.js:79
-#: src/js/controllers/join.js:65
+#: src/js/controllers/create.js:84
+#: src/js/controllers/join.js:68
msgid "Random"
msgstr "Per Zufall"
@@ -2202,6 +2295,11 @@ msgstr "Weniger anzeigen"
msgid "Read more"
msgstr "Mehr anzeigen"
+#: src/js/controllers/preferences.js:65
+#: src/js/controllers/tx-details.js:54
+msgid "Read more in our Wiki"
+msgstr ""
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
@@ -2216,7 +2314,7 @@ msgstr ""
msgid "Received"
msgstr "Empfangen"
-#: src/js/controllers/tx-details.js:113
+#: src/js/controllers/tx-details.js:130
msgid "Received Funds"
msgstr "Erhaltener Betrag"
@@ -2230,7 +2328,7 @@ msgstr "Eingehend"
msgid "Recent"
msgstr "Kürzlich"
-#: www/views/advancedSettings.html:20
+#: www/views/advancedSettings.html:21
msgid "Recent Transaction Card"
msgstr "Kürzlich Ausgeführte Transaktionen Karte"
@@ -2252,11 +2350,6 @@ msgstr "Empfänger"
msgid "Recovery phrase"
msgstr "Wiederherstellungsphrase"
-#: www/views/walletDetails.html:116
-#: www/views/walletDetails.html:36
-msgid "Recreate"
-msgstr "Wiederherstellen"
-
#: src/js/services/onGoingProcess.js:26
msgid "Recreating Wallet..."
msgstr "Wallet wiederherstellen..."
@@ -2265,8 +2358,8 @@ msgstr "Wallet wiederherstellen..."
msgid "Redeem now"
msgstr ""
-#: src/js/controllers/modals/txpDetails.js:57
-#: src/js/controllers/tx-details.js:63
+#: src/js/controllers/modals/txpDetails.js:63
+#: src/js/controllers/tx-details.js:80
msgid "Rejected"
msgstr "Abgelehnt"
@@ -2295,12 +2388,12 @@ msgstr "BitPay Karte entfernen?"
msgid "Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?"
msgstr "Das Entfernen des BitPay-Kontos löscht alle zugehörigen Daten von diesem Gerät. Soll wirklich das BityPay-Konto ({{email}}) von diesem Gerät entfernt werden?"
-#: www/views/join.html:113
-#: www/views/join.html:121
-#: www/views/tab-create-personal.html:84
-#: www/views/tab-create-personal.html:92
-#: www/views/tab-create-shared.html:113
-#: www/views/tab-create-shared.html:121
+#: www/views/join.html:116
+#: www/views/join.html:124
+#: www/views/tab-create-personal.html:86
+#: www/views/tab-create-personal.html:94
+#: www/views/tab-create-shared.html:115
+#: www/views/tab-create-shared.html:123
#: www/views/tab-export-file.html:17
msgid "Repeat password"
msgstr "Passwort wiederholen"
@@ -2309,7 +2402,7 @@ msgstr "Passwort wiederholen"
msgid "Repeat the password"
msgstr "Passwort wiederholen"
-#: www/views/preferences.html:55
+#: www/views/preferences.html:56
msgid "Request Fingerprint"
msgstr "Fingerabdruck anfordern"
@@ -2321,7 +2414,7 @@ msgstr "Einen bestimmten Betrag anfordern"
msgid "Request Spending Password"
msgstr "Berechtigungscode abfragen"
-#: www/views/tab-create-shared.html:42
+#: www/views/tab-create-shared.html:44
msgid "Required number of signatures"
msgstr "Erforderliche Anzahl von Signaturen"
@@ -2370,10 +2463,18 @@ msgstr ""
msgid "Scan your fingerprint please"
msgstr "Scannen Sie bitte Ihren Fingerabdruck"
+#: www/views/preferencesCash.html:22
+msgid "Scan your wallets for Bitcoin Cash"
+msgstr ""
+
#: src/js/services/onGoingProcess.js:30
msgid "Scanning Wallet funds..."
msgstr "Prüfe Wallet auf neue Beträge..."
+#: www/views/tab-home.html:95
+msgid "Scanning funds..."
+msgstr ""
+
#: www/views/includes/screenshotWarningModal.html:7
msgid "Screenshots are not secure"
msgstr "Screenshots sind nicht sicher"
@@ -2406,7 +2507,7 @@ msgstr ""
msgid "Select a backup file"
msgstr "Eine Sicherungsdatei auswählen"
-#: src/js/controllers/tab-receive.js:133
+#: src/js/controllers/tab-receive.js:139
msgid "Select a wallet"
msgstr "Wallet wählen"
@@ -2443,7 +2544,7 @@ msgstr "Adressen per e-Mail versenden"
msgid "Send by email"
msgstr "Per E-Mail versenden"
-#: src/js/controllers/confirm.js:151
+#: src/js/controllers/confirm.js:156
msgid "Send from"
msgstr "Senden von"
@@ -2482,7 +2583,7 @@ msgstr "Sende maximalen Betrag"
msgid "Sending transaction"
msgstr "Sende Transaktion"
-#: src/js/controllers/confirm.js:490
+#: src/js/controllers/confirm.js:524
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "Sende {{amountStr}} aus Ihrer Wallet {{name}}"
@@ -2493,7 +2594,7 @@ msgstr "Sende {{amountStr}} aus Ihrer Wallet {{name}}"
msgid "Sent"
msgstr "Gesendet"
-#: src/js/controllers/tx-details.js:112
+#: src/js/controllers/tx-details.js:129
msgid "Sent Funds"
msgstr "Guthaben senden"
@@ -2501,8 +2602,8 @@ msgstr "Guthaben senden"
msgid "Server response could not be verified"
msgstr "Antwort des Servers konnte nicht verifiziert werden"
-#: src/js/controllers/buyAmazon.js:96
-#: src/js/controllers/buyMercadoLibre.js:96
+#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyMercadoLibre.js:97
msgid "Service not available"
msgstr ""
@@ -2522,7 +2623,7 @@ msgstr "Sitzungsprotokoll"
msgid "Set up a password"
msgstr "Passwort einrichten"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Set your own fee in satoshis/byte"
msgstr ""
@@ -2557,13 +2658,13 @@ msgstr "Wiederherstellungsphrase anzeigen"
msgid "Show address"
msgstr "Adresse anzeigen"
-#: www/views/join.html:45
-#: www/views/tab-create-personal.html:25
-#: www/views/tab-create-shared.html:54
+#: www/views/join.html:48
+#: www/views/tab-create-personal.html:27
+#: www/views/tab-create-shared.html:56
#: www/views/tab-export-file.html:24
-#: www/views/tab-import-file.html:27
+#: www/views/tab-import-file.html:29
#: www/views/tab-import-hardware.html:30
-#: www/views/tab-import-phrase.html:32
+#: www/views/tab-import-phrase.html:35
msgid "Show advanced options"
msgstr "Erweiterte Optionen anzeigen"
@@ -2587,8 +2688,8 @@ msgstr "Unterschreibe Transaktion"
msgid "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted."
msgstr "Da nur Sie Ihr Geld kontrollieren müssen Sie Ihre Wiederherstellungsphrase gut sichern, für den Fall dass die App gelöscht wird."
-#: www/views/tab-create-personal.html:120
-#: www/views/tab-create-shared.html:149
+#: www/views/tab-create-personal.html:122
+#: www/views/tab-create-shared.html:151
msgid "Single Address Wallet"
msgstr "Wallet mit einer einzigen Adresse"
@@ -2597,17 +2698,27 @@ msgstr "Wallet mit einer einzigen Adresse"
msgid "Skip"
msgstr "Überspringen"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Slide"
-msgstr "Schieben"
+#: src/js/controllers/confirm.js:350
+#: 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/create.js:83
-#: src/js/controllers/join.js:68
+#: src/js/controllers/confirm.js:344
+msgid "Slide to pay"
+msgstr ""
+
+#: src/js/controllers/confirm.js:356
+#: src/js/controllers/modals/txpDetails.js:40
+msgid "Slide to send"
+msgstr ""
+
+#: src/js/controllers/create.js:88
+#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
msgstr "Wiederherstellungsphrase angeben..."
@@ -2623,7 +2734,7 @@ msgstr "Zahlungsvorschlag wurde nicht gefunden"
msgid "Spending Password needed"
msgstr "Berechtigungscode erforderlich"
-#: www/views/walletDetails.html:161
+#: www/views/walletDetails.html:173
msgid "Spending this balance will need significant Bitcoin network fees"
msgstr ""
@@ -2648,6 +2759,10 @@ msgstr ""
msgid "Super Economy"
msgstr "Niedrigste Priorität"
+#: www/views/preferencesCash.html:11
+msgid "Support Bitcoin Cash"
+msgstr ""
+
#: www/views/paperWallet.html:7
msgid "Sweep"
msgstr "Leeren"
@@ -2669,13 +2784,16 @@ msgstr "DIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN"
msgid "Take control of your money,
get started with bitcoin."
msgstr "Übernehmen Sie die Kontrolle über Ihr Geld,
Legen Sie los mit Bitcoins."
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "Anzeigen durch tippen und halten"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr ""
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "Zum Wiederholen antippen"
@@ -2690,8 +2808,8 @@ msgstr "Nutzungsbedingungen"
msgid "Terms of Use"
msgstr "Nutzungsbedingungen"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
@@ -2754,7 +2872,7 @@ msgstr "Die offizielle englischen Nutzungsbedingungen sind auf der BitPay Websit
msgid "The password of the recovery phrase (if set)"
msgstr "Das Passwort der Wiederherstellungsphrase (wenn eingestellt)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "Die Zahlung wurde erzeugt, kann aber nicht abgeschlossen werden. Bitte erneut über die Startseite versuchen"
@@ -2762,10 +2880,10 @@ msgstr "Die Zahlung wurde erzeugt, kann aber nicht abgeschlossen werden. Bitte e
msgid "The payment was removed by creator"
msgstr "Die Zahlung wurde vom Ersteller entfernt"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "Um die Wiederherstellungsphrase zu importieren könnte ein Passwort nötig sein"
@@ -2797,9 +2915,9 @@ msgstr "Die URL des Wallet-Diensts"
msgid "There is a new version of {{appName}} available"
msgstr "Es steht eine neue Version von {{appName}} zur Verfügung"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "Es ist ein Fehler im Formular aufgetreten"
@@ -2816,13 +2934,13 @@ 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:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "Diese Bitcoin Zahlungsaufforderung ist abgelaufen."
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
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."
@@ -2838,13 +2956,13 @@ msgstr ""
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Die Bestätigung dieser Transaktion kann sehr lange dauern oder verworfen werden, da vom Absender nur geringe Gebühren eingestellt wurden"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "Zeitachse"
@@ -2873,7 +2991,7 @@ msgstr ""
msgid "Top up in progress..."
msgstr ""
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr ""
@@ -2884,11 +3002,11 @@ msgstr ""
msgid "Total"
msgstr "Gesamt"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "Ingesamt gesperrter Gesamtsaldo"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Gesamtanzahl der Copayer"
@@ -2901,7 +3019,7 @@ msgstr ""
msgid "Touch ID Failed"
msgstr "Touch-ID gescheitert"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "Transaktion"
@@ -2918,9 +3036,9 @@ msgstr "Transaktionsverlauf"
msgid "Transaction already broadcasted"
msgstr "Transaktion wurde bereits übermittelt"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr ""
@@ -2928,7 +3046,7 @@ msgstr ""
msgid "Transaction initiated"
msgstr ""
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "Transaktion ist zu diesem Zeitpunkt nicht verfügbar"
@@ -2941,7 +3059,7 @@ msgstr "Transaktion konnte nicht gefunden werden"
msgid "Transactions without fee are not supported."
msgstr ""
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr ""
@@ -2965,15 +3083,11 @@ msgstr "Wiederherstellungsphrase eingeben (in der Regel 12 Wörter)"
msgid "Uh oh..."
msgstr "Uh oh..."
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "Unbestätigt"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "Währungseinheit"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "Nicht vesendete Transaktionen"
@@ -2993,7 +3107,7 @@ msgstr "Aktualisierung verfügbar"
msgid "Updating pending proposals. Please stand by"
msgstr "Aktualisiere anstehende Vorschläge. Bitte warten"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "Aktualisieren des Transaktionsverlaufs. Bitte warten."
@@ -3005,7 +3119,7 @@ msgstr "Aktualisiere... Bitte warten"
msgid "Urgent"
msgstr "Dringend"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "Unbestätigte Mittel einsetzen"
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "Nutzungsbedingungen anzeigen"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Transaktionen auf Insight anzeigen"
@@ -3043,7 +3157,7 @@ msgstr "Transaktionen auf Insight anzeigen"
msgid "View Update"
msgstr "Aktualisierungen anzeigen"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "Auf blockchain anzeigen"
@@ -3051,7 +3165,7 @@ msgstr "Auf blockchain anzeigen"
msgid "Visit mercadolivre.com.br →"
msgstr ""
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "Warnung: Ableitung der Schlüssel funktioniert nicht auf diesem Gerät/Wallet. Aktionen können nicht mit dieser Wallet durchgeführt werden."
@@ -3092,7 +3206,7 @@ msgstr "Wallet-Adressen"
msgid "Wallet Color"
msgstr "Wallet-Farbe"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "Wallet-Konfiguration (m-n)"
@@ -3100,7 +3214,7 @@ msgstr "Wallet-Konfiguration (m-n)"
msgid "Wallet Created"
msgstr "Wallet erstellt"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "Wallet-Id"
@@ -3117,9 +3231,9 @@ msgstr ""
msgid "Wallet Invitation"
msgstr "Wallet Einladung"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "Wallet-Schlüssel"
@@ -3131,13 +3245,13 @@ msgstr "Wallet-Name"
msgid "Wallet Name (at creation)"
msgstr "Wallet-Name (bei der Erzeugung)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "Wallet-Netzwerk"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "Wallet-Wiederherstellungsphrase"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "Wallet-Wiederherstellungsphrase ist ungültig"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "URL des Wallet-Diensts"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "Wallet-Einstellungen"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "Wallet-Typ"
@@ -3163,7 +3277,7 @@ msgstr "Wallet-Typ"
msgid "Wallet already exists"
msgstr "Wallet exstiert bereits"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
msgstr ""
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "Wallet braucht Sicherung"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "Wallet nicht gesichert"
@@ -3205,6 +3319,7 @@ 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
msgid "Wallet not registered"
msgstr "Wallet nicht registriert"
@@ -3225,13 +3340,13 @@ msgstr "Wallet-Dienst nicht gefunden"
msgid "Wallets"
msgstr "Wallets"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "Wallets & Integrationen"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3294,7 +3409,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:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "Falsche Anzahl von Wiederherstellungswörtern:"
@@ -3404,19 +3519,24 @@ msgstr ""
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "Ihre Wallet wird nie auf einem Cloud-Speicher oder einer Standard-Geräte-Backup gespeichert."
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[Guthaben versteckt]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr ""
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "Ihre BitPay Visa Karte(n) hinzufügen"
@@ -3425,7 +3545,7 @@ msgstr "Ihre BitPay Visa Karte(n) hinzufügen"
msgid "locked by pending payments"
msgstr "durch ausstehende Zahlungen gesperrt"
-#: src/js/services/profileService.js:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "Ich"
@@ -3437,25 +3557,11 @@ msgstr "name@beispiel.com"
msgid "preparing..."
msgstr "in Arbeit..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "zu akzeptieren"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "zu zahlen"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "zu senden"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr ""
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
msgstr ""
@@ -3463,7 +3569,7 @@ msgstr ""
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr "{{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:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} wird für Bitcoin-Netzwerkgebühren abgezogen werden."
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} wird für Bitcoin-Netzwerkgebühren abgezogen werden."
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr ""
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} Transaktionen werden heruntergeladen"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-von-{{wallet.n}}"
diff --git a/i18n/po/es.po b/i18n/po/es.po
index efc9369b5..fad8e7ae0 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-08-17 08:49-0400\n"
+"PO-Revision-Date: 2017-09-20 16:53-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -48,31 +48,31 @@ 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:351
+#: src/js/controllers/confirm.js:380
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:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "Acerca de"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "Aceptado"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "Cuenta"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "Número de cuenta"
@@ -106,9 +106,9 @@ msgstr "Añadir fondos"
msgid "Add Memo"
msgstr "Añadir nota"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "Agregar una contraseña"
@@ -116,9 +116,9 @@ msgstr "Agregar una contraseña"
msgid "Add account"
msgstr "Agregar cuenta"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "Agregar una contraseña opcional para asegurar la frase de recuperación"
@@ -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:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "Añadir descripción"
@@ -153,7 +153,7 @@ msgstr "Dirección"
msgid "Address Book"
msgstr "Agenda de contactos"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "Tipo de dirección"
@@ -161,7 +161,7 @@ msgstr "Tipo de dirección"
msgid "Addresses With Balance"
msgstr "Direcciones con fondos"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "Avanzado"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "¡Casi listo! Vamos a revisar."
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "Moneda Alternativa"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr "Amazon.com no está disponible en este momento. Inténtalo de nuevo más tarde."
@@ -216,7 +216,7 @@ msgstr "Importe"
msgid "Amount below minimum allowed"
msgstr "Cantidad por debajo del mínimo permitido"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "Monto demasiado grande"
@@ -256,11 +256,11 @@ msgstr "¿Está seguro de que desea eliminar este contacto?"
msgid "Are you sure you want to delete this wallet?"
msgstr "¿Estás seguro de borrar esta billetera?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "¿Estás seguro de rechazar esta transacción?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "¿Estás seguro de eliminar esta transacción?"
@@ -277,7 +277,7 @@ msgstr "¿Está seguro que desea cerrar la sesión de su cuenta BitPay Card?"
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "¿Estás seguro de quitar tu BitPay Card ({{lastFourDigits}}) de este dispositivo?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "Auditables"
@@ -294,13 +294,17 @@ msgstr "Balance disponible"
msgid "Average confirmation time"
msgstr "Tiempo promedio de confirmación"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "BIP32 para el camino de derivación de direcciones"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr "Billeteras BTC"
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "Copia de seguridad"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "Debes respaldar todas tus billeteras para utilizar esta función"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Necesita respaldar"
@@ -331,11 +335,11 @@ msgstr "Respaldar"
msgid "Backup your wallet before using this function"
msgstr "Respalda tu billetera para utilizar esta función"
-#: src/js/services/profileService.js:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "Invitación incorrecta a la billetera"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "Balance por Dirección"
@@ -352,15 +356,24 @@ msgstr "Tarjetas BitPay Visa®"
msgid "Bitcoin Address"
msgstr "Dirección Bitcoin"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr "Saldos Bitcoin Cash (BCH)"
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr "Soportar Bitcoin Cash"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Política de Comisión de la Red Bitcoin"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Unidad de Bitcoin"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr "Pago en Bitcoin cash"
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -386,8 +399,8 @@ msgstr "Compró {{amountUnitStr}}"
msgid "Broadcast Payment"
msgstr "Enviar Pago"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "Enviado"
@@ -417,7 +430,7 @@ msgstr "Comprar Bitcoin"
msgid "Buy a Gift Card"
msgstr "Comprar una Tarjeta de Regalo"
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
msgstr "Comprar desde"
@@ -429,10 +442,11 @@ msgstr "Comprando Bitcoins..."
msgid "Calculating fee"
msgstr "Calculando comisión"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr "Cancelar invitación"
msgid "Cannot Create Wallet"
msgstr "No se pudo crear la billetera"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "No puede unirse a la misma billetera más de una vez"
@@ -491,9 +505,19 @@ msgstr "Anular"
msgid "Clear cache"
msgstr "Limpiar cache"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "Click"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr "Click para aceptar"
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr "Click para pagar"
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr "Click para enviar"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "Click"
msgid "Close"
msgstr "Cerrar"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr "Moneda"
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "Color"
@@ -513,7 +542,7 @@ msgstr "Color"
msgid "Commit hash"
msgstr "Commit hash"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "Completar el proceso de respaldo para usar esta opción"
@@ -521,11 +550,11 @@ msgstr "Completar el proceso de respaldo para usar esta opción"
msgid "Completed"
msgstr "Terminadas"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -547,11 +576,11 @@ msgstr "Confirmar compra"
msgid "Confirm your PIN"
msgstr "Confirma tu PIN"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "Confirme su contraseña para enviar"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "Confirmaciones"
@@ -604,7 +633,7 @@ msgstr "Discrepancia en los datos del Copayer"
msgid "Copayer joined"
msgstr "Copayer unido"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Copayer {{$index}}"
@@ -626,7 +655,7 @@ msgstr "Copiar el texto como está en un lugar seguro (bloc de notas o correo el
msgid "Copy to clipboard"
msgstr "Copiar al portapapeles"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
msgstr "No se pudo acceder a Gift Card Service"
@@ -634,19 +663,19 @@ msgstr "No se pudo acceder a Gift Card Service"
msgid "Could not access the wallet at the server. Please check:"
msgstr "No se pudo acceder a la billetera desde el servidor. Por favor verificar:"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr "No se pudo acceder a Amazon.com"
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "No se pudo acceder a la billetera"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "No se puede agregar mensajes a una billetera importada sin la clave cifrada compartida"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "No se pudo enviar el pago"
@@ -654,45 +683,49 @@ msgstr "No se pudo enviar el pago"
msgid "Could not build transaction"
msgstr "No se pudo construir la transacción"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "No se pudo crear la dirección"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr "No se pudo crear la factura"
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr "No se pudo crear la transacción"
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
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:353
+#: src/js/services/profileService.js:363
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:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "No se pudo crear: frase de recuperación inválida"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "No se pudo descifrar el archivo, verifique su contraseña"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "No se pudo eliminar la propuesta de pago"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr "No se pudo duplicar"
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "No se pudo obtener comisión dinámica"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "No se pudo obtener comisión dinámica: {{feeLevel}}"
@@ -700,9 +733,9 @@ msgstr "No se pudo obtener comisión dinámica: {{feeLevel}}"
msgid "Could not get fee levels"
msgstr "No se pudieron obtener los niveles de comisión"
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr "No se pudo obtener la factura"
@@ -710,21 +743,21 @@ msgstr "No se pudo obtener la factura"
msgid "Could not get transactions"
msgstr "No se pudo obtener las transacciones"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "No se pudo importar"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
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:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "No se pudo unir a la billetera"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "No se pudo rechazar el pago"
@@ -741,22 +774,22 @@ msgstr "No se pudo quitar tarjeta"
msgid "Could not save preferences on the server"
msgstr "No se pueden guardar las preferencias en el servidor"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "No se pudo enviar el pago"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr "No se pudo enviar la transacción"
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "No se pudo actualizar el historial de transacciones"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "Crear billetera compartida"
msgid "Create bitcoin wallet"
msgstr "Crear billetera"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "Crear billetera nueva"
@@ -784,7 +817,7 @@ msgstr "Crear billetera nueva"
msgid "Create shared wallet"
msgstr "Crear billetera compartida"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Crear billetera {{formData.requiredCopayers}}-de-{{formData.totalCopayers}}"
@@ -814,7 +847,7 @@ msgstr "Personalizado"
msgid "Custom Amount"
msgstr "Importe Específico"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr "Comisión personalizada"
@@ -849,14 +882,14 @@ msgstr "Eliminando billetera..."
msgid "Deleting payment proposal"
msgstr "Eliminando la propuesta de pago"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "Camino de derivación"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "Estrategia de derivación"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr "Detalles"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Deshabilitado"
@@ -890,6 +924,14 @@ msgstr "¿No ves tu idioma en Crowdin? Contacta con el encargado del proyecto! N
msgid "Download"
msgstr "Descargar"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr "Duplicar a BCH"
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+msgstr "Duplicando billetera..."
+
#: www/views/addresses.html:19
msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment."
msgstr "Cada billetera puede generar billones de direcciones desde sus 12 palabras. Se genera una nueva dirección automáticamente cada vez que se recibe un pago."
@@ -915,6 +957,10 @@ msgstr "Dirección de correo electrónico"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "Se ha alcanzado el límite de direcciones vacías. No se pueden generar nuevas direcciones."
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr "Habilita la creación y operación de billetera Bitcoin Cash dentro de la aplicación."
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "Habilitar el acceso de la cámara en su configuración de dispositivo para empezar."
@@ -931,8 +977,12 @@ msgstr "Activar notificaciones push"
msgid "Enable the camera to get started."
msgstr "Activar la cámara empezar."
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "Ingrese contraseña para pagos"
@@ -948,13 +998,13 @@ msgstr "Ingrese el monto"
msgid "Enter custom fee"
msgstr "Ingrese comisión"
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "Ingrese una nueva contraseña para pagos"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "Introduce la frase de recuperación (BIP39)"
@@ -970,23 +1020,24 @@ msgstr "Ingrese su contraseña"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "Ingrese su contraseña"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "Error"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "Error al confirmar"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
msgstr "Error al crear tarjeta de regalo"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr "Error al crear la factura"
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "Error al crear billetera"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr "Error al obtener información de SendMax"
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr "Error en el Protocolo de Pago"
@@ -1076,7 +1130,7 @@ msgstr "Error de sincronización con la cuenta de BitPay"
msgid "Error scanning funds:"
msgstr "Error al escanear fondos:"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "Error al buscar fondos:"
@@ -1088,7 +1142,7 @@ msgstr "Error al actualizar las tarjetas de débito"
msgid "Exceeded daily limit of $500 per user"
msgstr "Se excedió el limite de $500 por usuario"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,12 +1168,12 @@ msgstr "Exportar a archivo"
msgid "Export wallet"
msgstr "Exportar billetera"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "Exportar vía código QR no es compatible para esta billetera"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "Claves Públicas Extendidas"
@@ -1188,12 +1242,12 @@ msgstr "Fallo en la verificación de la huella"
msgid "Finish"
msgstr "Finalizar"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "Para propósitos de auditoría"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "Desde"
msgid "From BitPay account"
msgstr "De la cuenta de BitPay"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr "Billetera Física"
@@ -1286,7 +1340,7 @@ msgstr "La Tarjeta de Regalo ya no esta disponible para usar"
msgid "Gift card"
msgstr "Tarjeta de regalo"
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "La tarjeta de regalo expiró"
@@ -1297,11 +1351,14 @@ msgstr "Tarjeta de regalo generada y lista para usar."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: src/js/controllers/onboarding/terms.js:23
+#: src/js/controllers/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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Volver"
@@ -1317,8 +1374,8 @@ msgstr "Volver"
msgid "Got it"
msgstr "Entiendo"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "Billetera Física"
@@ -1330,12 +1387,17 @@ msgstr "Equipo no conectado."
msgid "Hardware wallet"
msgstr "Billetera física"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr "Billeteras en hardware no son compatibles con Bitcoin Cash todavía"
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Ayuda & Soporte"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "La ayuda está disponible en el sitio web."
@@ -1347,17 +1409,17 @@ msgstr "Ocultar"
msgid "Hide Balance"
msgstr "Balance Oculto"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "Ocultar Tarjeta de Próximo Pasos"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "Ocultar opciones avanzadas"
@@ -1387,9 +1449,9 @@ msgstr "He leído, entendido y acepto los get started with bitcoin."
msgstr "Toma control de tu dinero,
comienza a utilizar bitcoin."
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "Tocar y mantener para mostrar"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr "Toca para recrear"
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "Toque para reintentar"
@@ -2690,8 +2808,8 @@ msgstr "Términos de uso"
msgid "Terms of Use"
msgstr "Términos de Uso"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
@@ -2754,7 +2872,7 @@ msgstr "Los términos y condiciones oficiales en inglés se encuentran disponibl
msgid "The password of the recovery phrase (if set)"
msgstr "La contraseña de la frase de recuperación (si existe)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "El pago fue creado pero no se pudo completar. Por favor intenta nuevamente desde la pantalla de inicio"
@@ -2762,10 +2880,10 @@ msgstr "El pago fue creado pero no se pudo completar. Por favor intenta nuevamen
msgid "The payment was removed by creator"
msgstr "El pago fue eliminado por el creador"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "La frase de recuperación podría requerir una contraseña para ser importada"
@@ -2797,9 +2915,9 @@ msgstr "URL de Wallet Service"
msgid "There is a new version of {{appName}} available"
msgstr "Hay una nueva versión de {{appName}} disponible"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "Hay un error en el formulario"
@@ -2816,13 +2934,13 @@ 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:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "Esta solicitud de pago ha caducado."
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
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."
@@ -2838,13 +2956,13 @@ msgstr "Este monto en la transacción es demasiado bajo comparado con las comisi
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"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "Línea de tiempo"
@@ -2873,7 +2991,7 @@ msgstr "Para {{reason}} primero debes agregar tu cuenta de BitPay - {{email}}"
msgid "Top up in progress..."
msgstr "Recarda en progreso..."
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr "Recargar {{amountStr}} a la tarjeta de débito ({{cardLastNumber}})"
@@ -2884,11 +3002,11 @@ msgstr "Recargar {{amountStr}} a la tarjeta de débito ({{cardLastNumber}})"
msgid "Total"
msgstr "Total"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "Balance Total Bloqueado"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Número total de copayers"
@@ -2901,7 +3019,7 @@ msgstr "Total de entradas de la billetera"
msgid "Touch ID Failed"
msgstr "Falló Touch ID"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "Transacción"
@@ -2918,9 +3036,9 @@ msgstr "Historial de Transacciones"
msgid "Transaction already broadcasted"
msgstr "La transacción ya fue enviada"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr "La transacción no ha sido creada"
@@ -2928,7 +3046,7 @@ msgstr "La transacción no ha sido creada"
msgid "Transaction initiated"
msgstr "Transacción iniciada"
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "La transacción no esta disponible en este momento"
@@ -2941,7 +3059,7 @@ msgstr "Transacción no encontrada"
msgid "Transactions without fee are not supported."
msgstr "Las transacciones sin comisión no están soportadas."
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr "Transferir a"
@@ -2965,15 +3083,11 @@ msgstr "Escribe la frase de recuperación (normalmente 12 palabras)"
msgid "Uh oh..."
msgstr "Ouch..."
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "Sin confirmar"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "Unidad"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "Transacciones no enviadas"
@@ -2993,7 +3107,7 @@ msgstr "Actualización Disponible"
msgid "Updating pending proposals. Please stand by"
msgstr "Actualizando propuestas de pago pendientes. Por favor, espera"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "Actualizando el historial de transacciones. Por favor aguarda un momento."
@@ -3005,7 +3119,7 @@ msgstr "Actualizando... Por favor, espera"
msgid "Urgent"
msgstr "Urgente"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "Utilizar los fondos sin confirmar"
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "Ver Términos de Uso"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Ver Transacción en Insight"
@@ -3043,7 +3157,7 @@ msgstr "Ver Transacción en Insight"
msgid "View Update"
msgstr "Ver Actualización"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "Ver en blockchain"
@@ -3051,7 +3165,7 @@ msgstr "Ver en blockchain"
msgid "Visit mercadolivre.com.br →"
msgstr "Ir a Mercadolivre.com.br →"
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "ADVERTENCIA: Derivación de la clave no funciona en este dispositivo/billetera. Acciones no pueden realizarse en esta billetera."
@@ -3092,7 +3206,7 @@ msgstr "Direcciones de la billetera"
msgid "Wallet Color"
msgstr "Color de la billetera"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "Configuración de la billetera (m-n)"
@@ -3100,7 +3214,7 @@ msgstr "Configuración de la billetera (m-n)"
msgid "Wallet Created"
msgstr "Billetera Creada"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "Id de la Billetera"
@@ -3117,9 +3231,9 @@ msgstr "Entradas de la billetera"
msgid "Wallet Invitation"
msgstr "Invitación para unirse a la billetera"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "Llave de la billetera"
@@ -3131,13 +3245,13 @@ msgstr "Nombre de la billetera"
msgid "Wallet Name (at creation)"
msgstr "Nombre de la billetera (al crear)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "Red de la billetera"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "Frase de recuperación de la billetera"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "La frase de recuperación no es válida"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "Wallet Service URL"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "Preferencias de la billetera"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "Tipo de billetera"
@@ -3163,7 +3277,7 @@ msgstr "Tipo de billetera"
msgid "Wallet already exists"
msgstr "La billetera ya existe"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
msgstr "El monedero ya existe en {{appName}}"
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "La billetera requiere copia de seguridad"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "Billetera sin copia de seguridad"
@@ -3205,6 +3319,7 @@ 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
msgid "Wallet not registered"
msgstr "Billetera no registrada"
@@ -3225,13 +3340,13 @@ msgstr "Wallet Service no encontrado"
msgid "Wallets"
msgstr "Billeteras"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "Billeteras & Integraciones"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3294,7 +3409,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:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "Número incorrecto de palabras:"
@@ -3404,19 +3519,24 @@ msgstr "Tu compra fue agregada a la lista de pendientes"
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "Tu billetera nunca se sube a la nube ni se resguarda automáticamente en el dispositivo."
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[Balance Oculto]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr "[Buscando Fondos]"
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "agregar sus tarjetas BitPay Visa"
@@ -3425,7 +3545,7 @@ msgstr "agregar sus tarjetas BitPay Visa"
msgid "locked by pending payments"
msgstr "bloqueado por pagos pendientes"
-#: src/js/services/profileService.js:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "yo"
@@ -3437,25 +3557,11 @@ msgstr "nombre@ejemplo.com"
msgid "preparing..."
msgstr "preparando..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "para aceptar"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "para pagar"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "para enviar"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} en tarjeta de regalo de Amazon.com"
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
msgstr "{{amountStr}} en Tarjeta de Regalo Mercado Livre Brasil"
@@ -3463,7 +3569,7 @@ 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:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} se descontará por comisión de la red bitcoin."
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} se descontará por comisión de la red bitcoin."
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} de la cantidad a enviar"
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transacciones descargadas"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-de-{{wallet.n}}"
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index a07b34bd8..ce0c91a1f 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-08-17 08:49-0400\n"
+"PO-Revision-Date: 2017-09-20 16:53-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -48,31 +48,31 @@ 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:351
+#: src/js/controllers/confirm.js:380
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:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "À propos"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "Acceptée"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "Compte"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "Numéro de compte"
@@ -106,9 +106,9 @@ msgstr "Ajouter des fonds"
msgid "Add Memo"
msgstr "Ajouter une note"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "Ajouter un mot de passe"
@@ -116,9 +116,9 @@ msgstr "Ajouter un mot de passe"
msgid "Add account"
msgstr "Ajouter un compte"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "Ajouter un mot de passe optionnel pour sécuriser la phrase de récupération"
@@ -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:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "Ajouter une description"
@@ -153,7 +153,7 @@ msgstr "Adresse"
msgid "Address Book"
msgstr "Répertoire"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "Type d'adresse"
@@ -161,7 +161,7 @@ msgstr "Type d'adresse"
msgid "Addresses With Balance"
msgstr "Adresses avec un solde"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "Paramètres avancés"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "C'est presque terminé ! Vérifions."
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "Devise alternative"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr "Amazon.com n’est pas disponible pour le moment. Veuillez réessayer plus tard."
@@ -216,7 +216,7 @@ msgstr "Montant"
msgid "Amount below minimum allowed"
msgstr "Montant en dessous du minimum autorisé"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "Le montant est trop élevé"
@@ -256,11 +256,11 @@ msgstr "Souhaitez-vous réellement supprimer ce contact ?"
msgid "Are you sure you want to delete this wallet?"
msgstr "Êtes-vous certain(e) de vouloir supprimer ce portefeuille ?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "Êtes-vous certain(e) de vouloir rejeter cette transaction ?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "Êtes-vous certain(e) de vouloir supprimer cette transaction ?"
@@ -277,7 +277,7 @@ msgstr "Souhaitez-vous réellement vous déconnecter de votre compte BitPay Card
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "Êtes-vous sûr(e) de vouloir supprimer votre BitPay Card ({{lastFourDigits}}) de cet appareil ?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "Vérifiable"
@@ -294,13 +294,17 @@ msgstr "Solde disponible"
msgid "Average confirmation time"
msgstr "Temps de confirmation moyen "
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "Chemin BIP32 pour la dérivation de l'adresse"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr "Portefeuilles BTC"
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "Sauvegarder"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "Sauvegardez tous les portefeuilles (livenet) avant d'utiliser cette fonction"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Sauvegarde requise"
@@ -331,11 +335,11 @@ 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:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "Mauvaise invitation de portefeuille"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "Solde par adresse"
@@ -352,15 +356,24 @@ msgstr "BitPay Visa® Cards"
msgid "Bitcoin Address"
msgstr "Adresse bitcoin"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr "Soldes Bitcoin Cash (BCH)"
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr "Prise en charge de Bitcoin Cash"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Frais de réseau"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Unité de Bitcoin"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr "Paiement Bitcoin Cash"
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -386,8 +399,8 @@ msgstr "{{amountUnitStr}} achetés"
msgid "Broadcast Payment"
msgstr "Diffuser le paiement"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "Diffusée"
@@ -417,7 +430,7 @@ msgstr "Acheter des bitcoins"
msgid "Buy a Gift Card"
msgstr "Acheter une carte-cadeau"
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
msgstr "Acheter depuis"
@@ -429,10 +442,11 @@ msgstr "Achat de bitcoins..."
msgid "Calculating fee"
msgstr "Calcul des frais"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr "Annuler l'invitation"
msgid "Cannot Create Wallet"
msgstr "Impossible de créer le portefeuille"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "Impossible de rejoindre le même portefeuille plus d'une fois"
@@ -491,9 +505,19 @@ msgstr "Effacer"
msgid "Clear cache"
msgstr "Vider le cache"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "Cliquez"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr "Cliquez pour accepter"
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr "Cliquez pour payer"
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr "Cliquez pour envoyer"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "Cliquez"
msgid "Close"
msgstr "Fermer"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr "Pièce"
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "Couleur"
@@ -513,7 +542,7 @@ msgstr "Couleur"
msgid "Commit hash"
msgstr "Commit hash"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "Terminez le processus de sauvegarde pour utiliser cette option"
@@ -521,11 +550,11 @@ msgstr "Terminez le processus de sauvegarde pour utiliser cette option"
msgid "Completed"
msgstr "Terminé"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -547,11 +576,11 @@ msgstr "Confirmer l'achat"
msgid "Confirm your PIN"
msgstr "Confirmez votre PIN"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "Confirmez votre nouveau code de dépenses"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "Confirmations"
@@ -604,7 +633,7 @@ msgstr "Les données Copayer ne correspondent pas"
msgid "Copayer joined"
msgstr "Un Copayer à rejoint"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Copayer {{$index}}"
@@ -626,7 +655,7 @@ msgstr "Copiez ce texte présenté tel quel vers un endroit sûr (bloc-notes ou
msgid "Copy to clipboard"
msgstr "Copier dans le presse-papier"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
msgstr "Impossible d'accéder au service de carte-cadeau"
@@ -634,19 +663,19 @@ msgstr "Impossible d'accéder au service de carte-cadeau"
msgid "Could not access the wallet at the server. Please check:"
msgstr "Impossible d'accéder au portefeuille via le serveur. Veuillez vérifier :"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr "Impossible d'accéder à Amazon.com"
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "Impossible d’accéder au portefeuille"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Could not add message to imported wallet without shared encrypting key"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "Impossible de diffuser le paiement"
@@ -654,55 +683,59 @@ msgstr "Impossible de diffuser le paiement"
msgid "Could not build transaction"
msgstr "Impossible de créer la transaction"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "Impossible de créer l'adresse"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr "Impossible de créer la facture"
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr "Impossible de créer la transaction"
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
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:353
+#: src/js/services/profileService.js:363
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:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Impossible de créer : Phrase de récupération du portefeuille invalide"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "Impossible de supprimer la proposition de paiement"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr "Impossible de dupliquer"
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "Impossible d'obtenir les frais dynamiques"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
-msgstr "Impossible d'obtenir les frais dynamiques pour ce choix : {{feeLevel}}"
+msgstr "Impossible d'obtenir les frais dynamiques pour : {{feeLevel}}"
#: src/js/controllers/modals/feeLevels.js:112
msgid "Could not get fee levels"
msgstr "Impossible d'obtenir les niveaux de frais"
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr "Impossible d'obtenir la facture"
@@ -710,21 +743,21 @@ msgstr "Impossible d'obtenir la facture"
msgid "Could not get transactions"
msgstr "Impossible de récupérer les transactions"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "Impossible d'importer"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
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:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "Impossible de rejoindre le portefeuille"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "Impossible de rejeter le paiement"
@@ -741,22 +774,22 @@ msgstr "Impossible de supprimer la carte"
msgid "Could not save preferences on the server"
msgstr "Impossible d'enregistrer les préférences sur le serveur"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "Impossible d'envoyer le paiement"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr "Impossible d'envoyer la transaction"
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "Impossible de mettre à jour l'historique des transactions"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "Créer un portefeuille partagé"
msgid "Create bitcoin wallet"
msgstr "Créer un portefeuille bitcoin"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "Créer"
@@ -784,7 +817,7 @@ msgstr "Créer"
msgid "Create shared wallet"
msgstr "Créer un portefeuille partagé"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Créer un portefeuille {{formData.requiredCopayers}}-sur-{{formData.totalCopayers}}"
@@ -814,7 +847,7 @@ msgstr "Personnalisés"
msgid "Custom Amount"
msgstr "Montant personnalisé"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr "Frais personnalisés"
@@ -849,14 +882,14 @@ msgstr "Suppression du portefeuille..."
msgid "Deleting payment proposal"
msgstr "Suppression de la proposition de paiement"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "Chemin de dérivation"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "Stratégie de dérivation"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr "Détails"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Désactivé"
@@ -890,6 +924,14 @@ msgstr "Vous ne voyez pas votre langue sur Crowdin ? Contactez le propriétaire
msgid "Download"
msgstr "Télécharger"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr "Dupliquer pour BCH"
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+msgstr "Duplication du portefeuille..."
+
#: www/views/addresses.html:19
msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment."
msgstr "Chaque portefeuille bitcoin peut générer des milliards d’adresses depuis votre sauvegarde de 12 mots. Une nouvelle adresse est automatiquement générée et affichée à chaque fois que vous recevez un paiement."
@@ -915,6 +957,10 @@ msgstr "Adresse e-mail"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "La limite d'adresses vides a été atteinte. Les nouvelles adresses ne peuvent plus être générées."
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr "Permet la création et la gestion de portefeuilles Bitcoin Cash."
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "Autorisez l’accès à la caméra dans les réglages de votre appareil pour commencer."
@@ -929,10 +975,14 @@ msgstr "Autoriser les notifications"
#: www/views/tab-scan.html:18
msgid "Enable the camera to get started."
-msgstr "Autorisez la caméra commencer."
+msgstr "Autorisez la caméra pour commencer."
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr "Activée"
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "Saisissez le code de dépenses"
@@ -948,13 +998,13 @@ msgstr "Saisissez un montant"
msgid "Enter custom fee"
msgstr "Saisissez des frais personnalisés"
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "Saisissez un nouveau code de dépenses"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "Saisissez la phrase de récupération (BIP39)"
@@ -970,23 +1020,24 @@ msgstr "Écrivez votre mot de passe"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "Écrivez votre mot de passe"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "Erreur"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "Erreur à la confirmation"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
msgstr "Erreur de création de la carte-cadeau"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr "Erreur de création de la facture"
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "Erreur de création du portefeuille"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr "Erreur d’obtention de l'information SendMax"
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr "Erreur dans le protocole de paiement"
@@ -1076,7 +1130,7 @@ msgstr "Erreur d'appariement du compte BitPay"
msgid "Error scanning funds:"
msgstr "Erreur de numérisation des fonds :"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "Erreur de balayage de portefeuille :"
@@ -1088,7 +1142,7 @@ msgstr "Erreur de mise à jour des cartes de débit"
msgid "Exceeded daily limit of $500 per user"
msgstr "La limite quotidienne de 500$ par utilisateur a été dépassée"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,12 +1168,12 @@ msgstr "Exporter vers un fichier"
msgid "Export wallet"
msgstr "Exporter le portefeuille"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "L'exportation via QR n'est pas supportée pour ce portefeuille"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "Clés publiques étendues"
@@ -1146,7 +1200,7 @@ msgstr "Frais"
#: www/views/modals/chooseFeeLevel.html:75
msgid "Fee level"
-msgstr "Niveau de frais"
+msgstr "Frais"
#: src/js/controllers/modals/feeLevels.js:100
msgid "Fee level is not defined"
@@ -1188,12 +1242,12 @@ msgstr "La numérisation digitale a échoué"
msgid "Finish"
msgstr "Terminer"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "À des fins de vérification"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "De"
msgid "From BitPay account"
msgstr "Depuis un compte BitPay"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr "Depuis un portefeuille matériel"
@@ -1237,7 +1291,7 @@ msgstr "Les fonds ont été ajoutés à la carte de débit"
#: www/views/paperWallet.html:22
msgid "Funds will be transferred to"
-msgstr "Les fonds seront transférés à"
+msgstr "Les fonds seront transférés à "
#: www/views/tab-receive.html:51
msgid "Generate new address"
@@ -1286,7 +1340,7 @@ msgstr "La carte-cadeau n'est plus utilisable"
msgid "Gift card"
msgstr "Carte-cadeau"
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "Carte-cadeau expirée"
@@ -1297,11 +1351,14 @@ msgstr "Carte-cadeau générée et prête à l’emploi."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: src/js/controllers/onboarding/terms.js:23
+#: src/js/controllers/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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Retour"
@@ -1317,8 +1374,8 @@ msgstr "Retour"
msgid "Got it"
msgstr "J'ai compris"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "Portefeuille matériel"
@@ -1330,12 +1387,17 @@ msgstr "Matériel non connecté."
msgid "Hardware wallet"
msgstr "Portefeuille matériel"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr "Les portefeuilles matériels ne sont pas encore pris en charge avec Bitcoin Cash"
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Aide & Support"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
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)."
@@ -1347,17 +1409,17 @@ msgstr "Masquer"
msgid "Hide Balance"
msgstr "Masquer le solde"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "Masquer la carte « Prochaines étapes »"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "Masquer les options avancées"
@@ -1387,9 +1449,9 @@ msgstr "J’ai lu, compris et suis d'accord avec les get started with bitcoin."
msgstr "Prenez le contrôle de votre argent,
commencez avec bitcoin."
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "Appuyez et maintenez pour afficher"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr "Appuyez pour recréer"
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "Tapotez pour réessayer"
@@ -2690,8 +2808,8 @@ msgstr "Conditions d'utilisation"
msgid "Terms of Use"
msgstr "Conditions d'utilisation"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
@@ -2754,7 +2872,7 @@ msgstr "Les conditions d'utilisation officielles en anglais sont disponibles sur
msgid "The password of the recovery phrase (if set)"
msgstr "Le mot de passe de la phrase de récupération (si configuré)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "Le paiement a été créé mais n'a pas pu être achevé. Veuillez réessayer depuis l'écran d'accueil"
@@ -2762,10 +2880,10 @@ msgstr "Le paiement a été créé mais n'a pas pu être achevé. Veuillez rées
msgid "The payment was removed by creator"
msgstr "Le paiement a été supprimé par le créateur"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "La phrase de récupération pourrait demander un mot de passe pour être importée"
@@ -2797,9 +2915,9 @@ msgstr "L’URL du service de portefeuille"
msgid "There is a new version of {{appName}} available"
msgstr "Une nouvelle version de {{appName}} est disponible"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "Il y a une erreur dans la forme"
@@ -2816,13 +2934,13 @@ 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:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "Cette demande de paiement bitcoin a expiré."
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
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."
@@ -2838,13 +2956,13 @@ msgstr "Ce montant de transaction est trop faible par rapport aux actuels frais
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"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "Chronologie"
@@ -2873,7 +2991,7 @@ msgstr "Pour {{reason}} vous devez d'abord ajouter votre compte BitPay - {{email
msgid "Top up in progress..."
msgstr "Rechargement en cours..."
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr "Rechargement de {{amountStr}} vers la carte de débit ({{cardLastNumber}})"
@@ -2884,11 +3002,11 @@ msgstr "Rechargement de {{amountStr}} vers la carte de débit ({{cardLastNumber}
msgid "Total"
msgstr "Total"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "Solde verrouillé total"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Nombre total de copayers"
@@ -2901,7 +3019,7 @@ msgstr "Entrées de portefeuille totales"
msgid "Touch ID Failed"
msgstr "Touch ID a échoué"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "Transaction"
@@ -2918,9 +3036,9 @@ msgstr "Historique des transactions"
msgid "Transaction already broadcasted"
msgstr "Transaction déjà diffusée"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr "La transaction n'a pas été créée"
@@ -2928,7 +3046,7 @@ msgstr "La transaction n'a pas été créée"
msgid "Transaction initiated"
msgstr "Transaction initiée"
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "La transaction n'est pas disponible pour l'instant"
@@ -2941,7 +3059,7 @@ msgstr "Transaction introuvable"
msgid "Transactions without fee are not supported."
msgstr "Les transactions sans frais ne sont pas supportées."
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr "Transférer à"
@@ -2965,15 +3083,11 @@ 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:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "Non confirmée"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "Unité"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "Transactions non envoyées"
@@ -2993,7 +3107,7 @@ msgstr "Mise à jour disponible"
msgid "Updating pending proposals. Please stand by"
msgstr "Mise à jour des propositions en attente. Veuillez patienter"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "Mise à jour de l'historique des transactions. Veuillez patienter."
@@ -3005,7 +3119,7 @@ msgstr "Mise à jour... veuillez patienter"
msgid "Urgent"
msgstr "Très élevés"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "Utiliser les fonds non confirmés"
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "Voir les conditions d'utilisation"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Voir la transaction sur Insight"
@@ -3043,7 +3157,7 @@ msgstr "Voir la transaction sur Insight"
msgid "View Update"
msgstr "Voir la mise à jour"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "Voir sur la blockchain"
@@ -3051,7 +3165,7 @@ msgstr "Voir sur la blockchain"
msgid "Visit mercadolivre.com.br →"
msgstr "Visiter mercadolivre.com.br →"
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "ATTENTION : La dérivation de la clé ne fonctionne pas sur cet appareil / portefeuille. Impossible d’effectuer des actions sur ce portefeuille."
@@ -3092,7 +3206,7 @@ msgstr "Adresses du portefeuille"
msgid "Wallet Color"
msgstr "Couleur du portefeuille"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "Configuration du portefeuille (m-n)"
@@ -3100,7 +3214,7 @@ msgstr "Configuration du portefeuille (m-n)"
msgid "Wallet Created"
msgstr "Portefeuille créé"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "Id du portefeuille"
@@ -3117,9 +3231,9 @@ msgstr "Entrées de portefeuille"
msgid "Wallet Invitation"
msgstr "Invitation de portefeuille"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "Clé du portefeuille"
@@ -3131,13 +3245,13 @@ msgstr "Nom du portefeuille"
msgid "Wallet Name (at creation)"
msgstr "Nom du portefeuille (à la création)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "Réseau du portefeuille"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "Phrase de récupération"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "La phrase de récupération du portefeuille est invalide"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "Wallet Service URL"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "Paramètres du portefeuille"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "Type de portefeuille"
@@ -3163,7 +3277,7 @@ msgstr "Type de portefeuille"
msgid "Wallet already exists"
msgstr "Le portefeuille existe déjà"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
msgstr "Le portefeuille existe déjà dans {{appName}}"
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "Le portefeuille a besoin d'une sauvegarde"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "Le portefeuille n'est pas sauvegardé"
@@ -3205,6 +3319,7 @@ 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
msgid "Wallet not registered"
msgstr "Portefeuille non enregistré"
@@ -3225,13 +3340,13 @@ msgstr "Wallet Service introuvable"
msgid "Wallets"
msgstr "Portefeuilles"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "Portefeuilles & intégrations"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3294,7 +3409,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:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "Nombre incorrect de mots de récupération :"
@@ -3404,19 +3519,24 @@ msgstr "Votre achat a été ajouté à la liste d’attente"
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "Votre portefeuille n’est jamais enregistré en dehors de votre appareil ou dans des sauvegardes qui lui sont propres."
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[Solde masqué]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr "[Analyse des fonds]"
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "ajoutez vos cartes BitPay Visa"
@@ -3425,7 +3545,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:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "moi"
@@ -3437,25 +3557,11 @@ msgstr "nom@exemple.com"
msgid "preparing..."
msgstr "préparation..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "pour accepter"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "pour payer"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "pour envoyer"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} pour la carte-cadeau Amazon.com"
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
msgstr "{{amountStr}} pour la carte-cadeau Mercado Livre Brazil"
@@ -3463,7 +3569,7 @@ 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:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin."
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin."
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} du montant d'envoi"
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transactions téléchargées"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-sur-{{wallet.n}}"
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 91ce64a04..3265e061c 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-08-16 09:23-0400\n"
+"PO-Revision-Date: 2017-09-20 16:53-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -41,38 +41,38 @@ msgstr "Darci un voto a 5 stelle ci aiuta a portare {{appName}} a più mani, e p
#: www/views/mercadoLibre.html:18
#: www/views/mercadoLibre.html:40
msgid "Only redeemable on Mercado Livre (Brazil)"
-msgstr ""
+msgstr "Solo rimborsabili su Mercado Livre (Brasile)"
#: 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 "Un membro del team esaminerà il tuo feedback appena possibile."
-#: src/js/controllers/confirm.js:351
+#: src/js/controllers/confirm.js:380
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:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "Informazioni"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "Accettata"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "Conto"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "Numero del Conto"
@@ -106,9 +106,9 @@ msgstr "Aggiungere fondi"
msgid "Add Memo"
msgstr "Aggiungi Memo"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "Aggiungi una password"
@@ -116,9 +116,9 @@ msgstr "Aggiungi una password"
msgid "Add account"
msgstr "Aggiungere account"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "Aggiungere una password facoltativa per proteggere la frase di recupero"
@@ -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:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "Aggiungi descrizione"
@@ -153,7 +153,7 @@ msgstr "Indirizzo"
msgid "Address Book"
msgstr "Rubrica Indirizzi"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "Tipo di indirizzo"
@@ -161,7 +161,7 @@ msgstr "Tipo di indirizzo"
msgid "Addresses With Balance"
msgstr "Indirizzi con saldo"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "Avanzato"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "Quasi finito! Ripassiamo."
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "Valuta alternativa"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr "Ia tabella dei guadagni di Amazon.com non è disponibile al momento. Per favore riprova piu tardi."
@@ -216,7 +216,7 @@ msgstr "Ammontare"
msgid "Amount below minimum allowed"
msgstr "Importo inferiore al minimo consentito"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "Quantità troppo grande"
@@ -230,7 +230,7 @@ msgstr "Un aggiornamento dell'app è disponibile. Per la tua sicurezza è consig
#: www/views/backupWarning.html:14
msgid "Anyone with your backup phrase can access or spend your bitcoin."
-msgstr "Qualcuno con il tuo backup phrase potrebbe avere accesso o spendere i tuoi bitcoin."
+msgstr "Qualcuno con la tua frase di recupero potrebbe avere accesso o spendere i tuoi bitcoin."
#: www/views/addresses.html:94
msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)"
@@ -256,11 +256,11 @@ msgstr "Sei sicuro di voler cancellare questo contatto?"
msgid "Are you sure you want to delete this wallet?"
msgstr "Sei sicuro di voler eliminare questo portafoglio?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "Sei sicuro di voler rifiutare questa transazione?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "Sei sicuro di voler rimuovere questa transazione?"
@@ -277,7 +277,7 @@ msgstr "Sei sicuro che vuoi uscire dal tuo account BitPay Card?"
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "Sei certo di volere rimuovere la tua BitPay Card ({{lastFourDigits}}) da questo dispositivo?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "Controllabile"
@@ -294,13 +294,17 @@ msgstr "Saldo disponibile"
msgid "Average confirmation time"
msgstr "Tempo previsto per la conferma"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "Percorso BIP32 per generare l'indirizzo"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr "Portafogli BTC"
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "Backup"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "Fai un backup di tutti i portafogli sulla livenet prima di utilizzare questa funzione"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Backup necessario"
@@ -331,11 +335,11 @@ 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:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "Invito al wallet non corretto"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "Bilancio per indirizzo"
@@ -352,15 +356,24 @@ msgstr "Carte di BitPay Visa®"
msgid "Bitcoin Address"
msgstr "Indirizzo Bitcoin"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr "Saldi di Bitcoin Cash (BCH)"
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr "Supporto Bitcoin Cash"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Criterio delle Commissioni del Bitcoin Network"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Unità di Bitcoin"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr "Pagamento Bitcoin Cash"
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -386,8 +399,8 @@ msgstr "Comprato {{amountUnitStr}}"
msgid "Broadcast Payment"
msgstr "Diffusione del Pagamento"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "Trasmesso"
@@ -415,9 +428,9 @@ msgstr "Acquista Bitcoin"
#: www/views/mercadoLibre.html:22
#: www/views/mercadoLibre.html:50
msgid "Buy a Gift Card"
-msgstr ""
+msgstr "Acquista una carta regalo"
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
msgstr "Acquista da"
@@ -429,10 +442,11 @@ msgstr "Comprare Bitcoin..."
msgid "Calculating fee"
msgstr "Calcolo commissione"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr "Annulla invito"
msgid "Cannot Create Wallet"
msgstr "Impossibile creare portafoglio"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "Non è possibile aggiungere un portafoglio più di una volta"
@@ -491,9 +505,19 @@ msgstr "Elimina"
msgid "Clear cache"
msgstr "Svuota la cache"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "Click"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr "Fare clic per accettare"
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr "Fai clic per pagare"
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr "Clicca per inviare"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "Click"
msgid "Close"
msgstr "Chiudi"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr "Moneta"
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "Colore"
@@ -513,7 +542,7 @@ msgstr "Colore"
msgid "Commit hash"
msgstr "Commit hash"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "Completare il processo di backup per utilizzare questa opzione"
@@ -521,11 +550,11 @@ msgstr "Completare il processo di backup per utilizzare questa opzione"
msgid "Completed"
msgstr "Completato"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -547,11 +576,11 @@ msgstr "Conferma acquisto"
msgid "Confirm your PIN"
msgstr "Conferma il tuo PIN"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "Conferma la tua nuova password di spesa"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "Conferme"
@@ -604,7 +633,7 @@ msgstr "Mancata corrispondenza dei dati del copayer"
msgid "Copayer joined"
msgstr "Copayer iscritto"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Copayer {{$index}}"
@@ -626,27 +655,27 @@ msgstr "Copia questo testo cosí com'è in un posto sicuro (blocco note o email)
msgid "Copy to clipboard"
msgstr "Copia negli appunti"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
-msgstr ""
+msgstr "Impossibile accedere Servizio Carta Regalo"
#: www/views/tab-import-phrase.html:2
msgid "Could not access the wallet at the server. Please check:"
msgstr "Non può accedere al portafoglio sul server. Si prega di controllare:"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr "Impossibile accedere ad Amazon.com"
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "Impossibile accedere al portafoglio"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Non puoi aggiungere un messaggio da importare nel portafoglio senza condividere la chiave criptata"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "Impossibile trasmettere il pagamento"
@@ -654,45 +683,49 @@ msgstr "Impossibile trasmettere il pagamento"
msgid "Could not build transaction"
msgstr "Non è possibile generare la transazione"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "Impossibile creare un indirizzo"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr "Non è stato creata la fattura"
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr "Non è possibile creare la transazione"
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
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:353
+#: src/js/services/profileService.js:363
msgid "Could not create using the specified extended public key"
msgstr "Non è possibile creare usando questa chiave estesa pubblica"
-#: src/js/services/profileService.js:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Impossibile creare: Frase di recupero portafoglio non valida"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "Impossibile decifrare il file, controlla la tua password"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "Impossibile eliminare la proposta di pagamento"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr "Duplicazione non riuscita"
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "Impossibile avere commissioni dinamiche"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "Impossibile avere la commissione per il livello: {{feeLevel}}"
@@ -700,9 +733,9 @@ msgstr "Impossibile avere la commissione per il livello: {{feeLevel}}"
msgid "Could not get fee levels"
msgstr "Livelli commissione non disponibile"
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr "La fattura non puo essere creata"
@@ -710,21 +743,21 @@ msgstr "La fattura non puo essere creata"
msgid "Could not get transactions"
msgstr "Non è possibile ottenere le transazioni"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "Impossibile importare"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
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:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "Impossibile partecipare al portafoglio"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "Impossibile rifiutare il pagamento"
@@ -741,22 +774,22 @@ msgstr "Impossibile rimuovere la carta"
msgid "Could not save preferences on the server"
msgstr "Impossibile salvare le preferenze nel server"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "Impossibile inviare il pagamento"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr "Non è possibile inviare la transazione"
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "Impossibile aggiornare la cronologia delle transazioni"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "Creare portafoglio condiviso"
msgid "Create bitcoin wallet"
msgstr "Creare portafoglio bitcoin"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "Crea nuovo portafoglio"
@@ -784,7 +817,7 @@ msgstr "Crea nuovo portafoglio"
msgid "Create shared wallet"
msgstr "Creare portafoglio condiviso"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Creare il portafoglio di {{formData.requiredCopayers}}-di-{{formData.totalCopayers}}"
@@ -814,7 +847,7 @@ msgstr "Personalizzata"
msgid "Custom Amount"
msgstr "Importo personalizzato"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr "Commissione personalizzata"
@@ -849,14 +882,14 @@ msgstr "Eliminazione del portafoglio..."
msgid "Deleting payment proposal"
msgstr "Cancello la richiesta di pagamento"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "Percorso derivato"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "Strategia di derivazione"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr "Dettagli"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Disabilitato"
@@ -890,6 +924,14 @@ msgstr "Non vedi la tua lingua su Crowdin? Contatta il proprietario su Crowdin!
msgid "Download"
msgstr "Download"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr "Duplicato per BCH"
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+msgstr "Duplicazione di portafoglio..."
+
#: www/views/addresses.html:19
msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment."
msgstr "Ogni portafoglio bitcoin è in grado di generare miliardi di indirizzi dal tuo backup di 12 parole. Un nuovo indirizzo verrà automaticamente generato e mostrato ogni volta che riceverai un pagamento."
@@ -915,6 +957,10 @@ msgstr "Indirizzo Email"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "Raggiunto il limite degli indirizzi vuoti. Non possono essere generati nuovi indirizzi."
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr "Attivare la creazione del portafoglio funzionalità Bitcoin Cash e all'interno dell'App."
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "Abilita l'accesso alla fotocamera dalle impostazioni del tuo dispositivo per iniziare."
@@ -931,8 +977,12 @@ msgstr "Abilitare le notifiche push"
msgid "Enable the camera to get started."
msgstr "Abilita la fotocamera per iniziare."
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr "Abilitato"
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "Inserisci Password di spesa"
@@ -942,19 +992,19 @@ msgstr "Inserisci Due Fattori per il tuo account BitPay"
#: www/views/amount.html:4
msgid "Enter amount"
-msgstr ""
+msgstr "Inserisci importo"
#: www/views/modals/chooseFeeLevel.html:41
msgid "Enter custom fee"
msgstr "Inserisci commissione personalizzata"
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "Inserisci la nuova password di spesa"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "Inserire la frase di recupero (BIP39)"
@@ -970,23 +1020,24 @@ msgstr "Inserisci la tua password"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "Inserisci la tua password"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "Errore"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "Errore di conferma"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
msgstr "Errore nella creazione della Gift card"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr "Errore nella creazione della fattura"
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "Errore creazione portafoglio"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr "Errore nel recupero di informazione SendMax"
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr "Errore nel protocollo di pagamento"
@@ -1076,7 +1130,7 @@ msgstr "Errore di accoppiamento BitPay Account"
msgid "Error scanning funds:"
msgstr "Errore di scansione dei fondi:"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "Errore nello spazzolamento del portafoglio:"
@@ -1088,7 +1142,7 @@ msgstr "Errore durante l'aggiornamento delle carte di debito"
msgid "Exceeded daily limit of $500 per user"
msgstr "Superato il limite giornaliero di $500 per utente"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,12 +1168,12 @@ msgstr "Esporta in un file"
msgid "Export wallet"
msgstr "Esporta portafoglio"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "Per questo portafoglio non è supportata l'esportazione tramite QR"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "Chiave pubblica estesa"
@@ -1176,7 +1230,7 @@ msgstr "File/Testo"
#: www/views/preferencesLogs.html:17
msgid "Filter setting"
-msgstr ""
+msgstr "Impostazione del filtro"
#: src/js/services/fingerprintService.js:43
#: src/js/services/fingerprintService.js:48
@@ -1188,12 +1242,12 @@ msgstr "Scansione dito fallita"
msgid "Finish"
msgstr "Fine"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "Per finalità di controllo"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "Da"
msgid "From BitPay account"
msgstr "Dal conto BitPay"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr "Dal portafoglio Hardware"
@@ -1262,7 +1316,7 @@ msgstr "Ricevi notizie e aggiornamenti da BitPay"
#: www/views/onboarding/welcome.html:8
msgctxt "button"
msgid "Get started"
-msgstr ""
+msgstr "Per iniziare"
#: www/views/bitpayCard.html:49
msgid "Get started"
@@ -1279,14 +1333,14 @@ msgstr "Ottenendo i livelli di commissione..."
#: 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 ""
+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:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "Carta regalo scaduta"
@@ -1297,11 +1351,14 @@ msgstr "Carta regalo generata e pronta all'uso."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: 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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Indietro"
@@ -1317,8 +1374,8 @@ msgstr "Indietro"
msgid "Got it"
msgstr "Ok"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "Portafoglio Hardware"
@@ -1330,12 +1387,17 @@ msgstr "Hardware non collegato."
msgid "Hardware wallet"
msgstr "Portafoglio hardware"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr "I portafogli hardware non sono ancora supportati con Bitcoin Cash"
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Aiuto e Assistenza"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "Guida e informazioni di supporto tecnico sono disponibili sul sito web."
@@ -1347,17 +1409,17 @@ msgstr "Nascondere"
msgid "Hide Balance"
msgstr "Nascondere saldo"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "Nascondere le successive procedure per la carta"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "Nascondi opzioni avanzate"
@@ -1387,9 +1449,9 @@ msgstr "Ho letto, compreso, e sono d'accordo con get started with bitcoin."
msgstr "Prendi il controllo del tuo denaro,
inizia con bitcoin."
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "Toccare e tenere premuto per mostrare"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr "Toccare per ricreare"
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "Tocca per riprovare"
@@ -2690,8 +2808,8 @@ msgstr "Termini di utilizzo"
msgid "Terms of Use"
msgstr "Termini di Utilizzo"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
@@ -2754,7 +2872,7 @@ msgstr "I termini di servizio ufficiali in inglese sono disponibili sul sito web
msgid "The password of the recovery phrase (if set)"
msgstr "La password della frase recupero (se impostata)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "Il pagamento è stato creato ma è stato impossibile completarlo. Per favore prova di nuovo dalla schermata iniziale"
@@ -2762,10 +2880,10 @@ msgstr "Il pagamento è stato creato ma è stato impossibile completarlo. Per fa
msgid "The payment was removed by creator"
msgstr "Il pagamento è stato rimosso dal creatore"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "La frase di recupero potrebbe richiedere una password per essere importata"
@@ -2797,9 +2915,9 @@ msgstr "L'URL del servizio di portafoglio"
msgid "There is a new version of {{appName}} available"
msgstr "C'è una nuova versione di {{appName}} disponibile"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "C'è un errore nel form"
@@ -2816,13 +2934,13 @@ 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:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "Questa richiesta di pagamento in bitcoin è scaduta."
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
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."
@@ -2838,13 +2956,13 @@ msgstr "Questo importo della transazione è troppo piccolo rispetto alle attuali
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"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "Cronologia"
@@ -2873,7 +2991,7 @@ msgstr "Per {{reason}} è necessario innanzitutto aggiungere il tuo account BitP
msgid "Top up in progress..."
msgstr "Ricarica in corso..."
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr "Ricaricare di {{amountStr}} sulla carta di debito ({{cardLastNumber}})"
@@ -2884,11 +3002,11 @@ msgstr "Ricaricare di {{amountStr}} sulla carta di debito ({{cardLastNumber}})"
msgid "Total"
msgstr "Totale"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "Totale Importo Bloccato"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Numero totale di copayer"
@@ -2901,7 +3019,7 @@ msgstr "Totale ingressi nel portafoglio"
msgid "Touch ID Failed"
msgstr "Touch ID Fallito"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "Transazione"
@@ -2918,9 +3036,9 @@ msgstr "Cronologia delle transazioni"
msgid "Transaction already broadcasted"
msgstr "Transazione già trasmessa"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr "La transazione non è stata creata"
@@ -2928,7 +3046,7 @@ msgstr "La transazione non è stata creata"
msgid "Transaction initiated"
msgstr "Transazione avviata"
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "Transazione non disponibile in questo momento"
@@ -2941,7 +3059,7 @@ msgstr "Transazione non trovata"
msgid "Transactions without fee are not supported."
msgstr "Non sono supportate transazioni senza commissione."
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr "Trasferisci a"
@@ -2965,15 +3083,11 @@ msgstr "Digitare la Frase di Recupero (tipicamente 12 parole)"
msgid "Uh oh..."
msgstr "Oh oh..."
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "Non confermato"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "Unità"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "Transazioni non inviate"
@@ -2993,7 +3107,7 @@ msgstr "Aggiornamento Disponibile"
msgid "Updating pending proposals. Please stand by"
msgstr "Aggiornamento in attesa di proposte. Si prega di attendere"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "Aggiornamento cronologia delle transazioni. Siete pregati di attendere."
@@ -3005,7 +3119,7 @@ msgstr "In aggiornamento... Attendere"
msgid "Urgent"
msgstr "Urgente"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "Usa i fondi non confermati"
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "Visualizza i termini di servizio"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Visualizzazione della transazione su Insight"
@@ -3043,15 +3157,15 @@ msgstr "Visualizzazione della transazione su Insight"
msgid "View Update"
msgstr "Visualizza aggiornamenti"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "Mostra su blockchain"
#: www/views/mercadoLibre.html:26
msgid "Visit mercadolivre.com.br →"
-msgstr ""
+msgstr "Visita mercadolivre.com.br →"
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "ATTENZIONE: La derivazione della chiave non funziona su questo dispositivo/portafoglio. Le operazioni non possono essere eseguite su questo portafoglio."
@@ -3092,7 +3206,7 @@ msgstr "Indirizzi del portafoglio"
msgid "Wallet Color"
msgstr "Colore portafoglio"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "Configurazione di portafoglio (m-n)"
@@ -3100,7 +3214,7 @@ msgstr "Configurazione di portafoglio (m-n)"
msgid "Wallet Created"
msgstr "Portafoglio creato"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "Id portafoglio"
@@ -3117,9 +3231,9 @@ msgstr "Ingressi nel portafoglio"
msgid "Wallet Invitation"
msgstr "Invito Portafoglio"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "Chiave del portafoglio"
@@ -3131,13 +3245,13 @@ msgstr "Nome Portafoglio"
msgid "Wallet Name (at creation)"
msgstr "Nome portafoglio (al momento della creazione)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "Portafoglio di rete"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "Frase di recupero del portafoglio"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "Frase di recupero del portafoglio non è valida"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "URL del servizio di portafoglio"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "Impostazioni del portafoglio"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "Tipo di portafoglio"
@@ -3163,9 +3277,9 @@ msgstr "Tipo di portafoglio"
msgid "Wallet already exists"
msgstr "Il portafoglio esiste già"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
-msgstr ""
+msgstr "Portafoglio è già in {{appName}}"
#: www/views/includes/walletActivity.html:6
msgid "Wallet created"
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "Il portafoglio richiede password"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "Portafoglio senza backup"
@@ -3205,6 +3319,7 @@ 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
msgid "Wallet not registered"
msgstr "Portafoglio non registrato"
@@ -3225,13 +3340,13 @@ msgstr "Wallet service non trovato"
msgid "Wallets"
msgstr "Portafogli"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "Portafogli & integrazioni"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3294,7 +3409,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:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "Numero errato delle parole di recupero:"
@@ -3361,7 +3476,7 @@ msgstr "La carta BitPay è pronta. Aggiungi fondi alla tua carta per iniziare ad
#: www/views/mercadoLibre.html:57
#: www/views/mercadoLibreCards.html:6
msgid "Your Gift Cards"
-msgstr ""
+msgstr "Le tue carte regalo"
#: www/views/includes/confirmBackupPopup.html:6
msgid "Your bitcoin wallet is backed up!"
@@ -3404,19 +3519,24 @@ msgstr "Il tuo acquisto è stato aggiunto alla lista d'attesa"
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "Il tuo portafoglio non viene mai salvato in archiviazione cloud o nel normale backup del dispositivo."
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[Fondi Nascosti]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr "[Scansione fondi]"
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "aggiungi la tua carta(e) BitPay Visa"
@@ -3425,7 +3545,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:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "io"
@@ -3437,33 +3557,19 @@ msgstr "nome@esempio.com"
msgid "preparing..."
msgstr "preparazione..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "per accettare"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "a pagare"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "per inviare"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} per una carta regalo Amazon.com"
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
-msgstr ""
+msgstr "{{amountStr}} per Mercado Livre Brasile Gift Card"
#: www/views/preferencesBwsUrl.html:21
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr "{{appName}} dipende dal servizio portafoglio di Bitcore (BWS) per informazioni blockchain, networking e sincronizzazione di Copayer. La configurazione predefinita fa riferimento a https://bws.bitpay.com (istanza di BitPay BWS pubblica)."
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} verranno detratti come commissione per il network."
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} verranno detratti come commissione per il network."
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} dell'importo d'invio"
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transazioni scaricate"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-di-{{wallet.n}}"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 646dd2e33..31580f997 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-08-16 09:23-0400\n"
+"PO-Revision-Date: 2017-09-19 14:07-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -48,31 +48,31 @@ msgstr "Mercado Livre (ブラジル)のみで引き換え可能"
msgid "A member of the team will review your feedback as soon as possible."
msgstr "ただちに開発メンバーでいただいた評価を拝読し参考にさせていただきます。"
-#: src/js/controllers/confirm.js:351
+#: src/js/controllers/confirm.js:380
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "注意:合計{{amountAboveMaxSizeStr}} を除外しました。取引に許可される最大サイズを超えました"
-#: src/js/controllers/confirm.js:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "このアプリについて"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "承諾済"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "ポケット"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "ポケット番号"
@@ -106,9 +106,9 @@ msgstr "資金を追加"
msgid "Add Memo"
msgstr "メモを追加"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "復元フレーズ用パスワードを追加"
@@ -116,9 +116,9 @@ msgstr "復元フレーズ用パスワードを追加"
msgid "Add account"
msgstr "アカウントを追加"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "フレーズを守るために任意のパスワードをかけて下さい"
@@ -126,7 +126,7 @@ msgstr "フレーズを守るために任意のパスワードをかけて下さ
msgid "Add as a contact"
msgstr "連絡先に追加"
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "詳細を追加"
@@ -153,7 +153,7 @@ msgstr "アドレス"
msgid "Address Book"
msgstr "アドレス帳"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "アドレスの種類"
@@ -161,7 +161,7 @@ msgstr "アドレスの種類"
msgid "Addresses With Balance"
msgstr "残高のあるアドレス"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "上級者向け"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "ほぼ完了!確認してみましょう。"
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "表示通貨"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr "Amazon.com は現在ご利用できません、また後でお試しください"
@@ -216,7 +216,7 @@ msgstr "金額"
msgid "Amount below minimum allowed"
msgstr "送金可能最少額を下回っています"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "金額が大きすぎます"
@@ -258,11 +258,11 @@ msgid "Are you sure you want to delete this wallet?"
msgstr "本当にこのウォレットを削除しても\n"
"宜しいですか?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "この取引を却下してもよろしいですか?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "この取引を破棄してもよろしいですか?"
@@ -279,7 +279,7 @@ msgstr "BitPayカードアカウントからログアウトしてもよろしい
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "この端末から BitPay カード ({{lastFourDigits}}) を本当に削除してもよろしいですか?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "監査用"
@@ -296,13 +296,17 @@ msgstr "送金可能残高"
msgid "Average confirmation time"
msgstr "平均承認時間"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "階級アドレス派生のパス"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr ""
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "バックアップ"
@@ -316,7 +320,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "この機能を使う前に必ず全てのウォレットの復元フレーズのバックアップを取って下さい!"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "要バックアップ"
@@ -333,11 +337,11 @@ msgstr "ウォレットをバックアップ"
msgid "Backup your wallet before using this function"
msgstr "この機能を使う前に必ず復元フレーズのバックアップを取って下さい!"
-#: src/js/services/profileService.js:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "不正なウォレット招待コード"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "アドレスごとの残高"
@@ -354,15 +358,24 @@ msgstr "BitPayのVISA® カード"
msgid "Bitcoin Address"
msgstr "ビットコインアドレス"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr ""
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "ビットコインネットワークの手数料設定"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Bitcoin 単位"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr ""
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -388,8 +401,8 @@ msgstr "{{amountUnitStr}} 購入済み"
msgid "Broadcast Payment"
msgstr "取引送信"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "送信済み"
@@ -419,7 +432,7 @@ msgstr "ビットコインを購入"
msgid "Buy a Gift Card"
msgstr "ギフトカードの購入"
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
msgstr "今すぐ購入"
@@ -431,10 +444,11 @@ msgstr "ビットコインを購入中..."
msgid "Calculating fee"
msgstr "手数料計算中..."
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -457,7 +471,7 @@ msgstr "招待状のキャンセル"
msgid "Cannot Create Wallet"
msgstr "ウォレットを作成できません。"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "同じ端末で同じウォレットに複数回参加することができません。"
@@ -493,9 +507,19 @@ msgstr "やり直し"
msgid "Clear cache"
msgstr "キャッシュを消去"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "クリックして"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr ""
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr ""
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr ""
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -507,6 +531,11 @@ msgstr "クリックして"
msgid "Close"
msgstr "閉じる"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr ""
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "色"
@@ -515,7 +544,7 @@ msgstr "色"
msgid "Commit hash"
msgstr "コミットのハッシュ値"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "この機能をご利用いただくにはバックアップを行う必要があります"
@@ -523,11 +552,11 @@ msgstr "この機能をご利用いただくにはバックアップを行う必
msgid "Completed"
msgstr "完了"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -549,11 +578,11 @@ msgstr "購入の確認"
msgid "Confirm your PIN"
msgstr "確認のためPINを再入力してください"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "新しい送金時パスワードを確認してください"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "承認回数"
@@ -606,7 +635,7 @@ msgstr "ウォレット参加者のデータ不整合"
msgid "Copayer joined"
msgstr "ウォレット参加者が加わりました"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "ウォレット参加者 {{$index}}"
@@ -628,7 +657,7 @@ msgstr "このテキストを安全な場所に貼り付けて保管して下さ
msgid "Copy to clipboard"
msgstr "クリップボードへコピー"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
msgstr "ギフトカードサービスにアクセスできません"
@@ -636,19 +665,19 @@ msgstr "ギフトカードサービスにアクセスできません"
msgid "Could not access the wallet at the server. Please check:"
msgstr "サーバーにてウォレットの確認ができませんでした。こちらをご確認下さい:"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr "Amazon.comにアクセスできませんでした。"
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "ウォレットにアクセスできませんでした。"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "共有キー無しでインポートされたウォレットへのメッセージの追加ができません"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "送金を配信できませんでした。"
@@ -656,45 +685,49 @@ msgstr "送金を配信できませんでした。"
msgid "Could not build transaction"
msgstr "取引を作成できませんでした。"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "アドレスを生成できませんでした。"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr "請求を作成できませんでした"
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr "取引を作成できませんでした。"
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
msgid "Could not create using the specified extended private key"
msgstr "指定された拡張秘密鍵で作成できませんでした。"
-#: src/js/services/profileService.js:353
+#: src/js/services/profileService.js:363
msgid "Could not create using the specified extended public key"
msgstr "指定された拡張公開鍵で作成できませんでした。"
-#: src/js/services/profileService.js:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "作成できません:ウォレットの復元フレーズが不正です。"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "複合化できませんでした。パスワードが正しいかご確認下さい。"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "送金の提案を削除できませんでした"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr ""
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "手数料の金額を取得できませんでした。"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "次の手数料レートを取得できませんでした: {{feeLevel}}"
@@ -702,9 +735,9 @@ msgstr "次の手数料レートを取得できませんでした: {{feeLevel}}"
msgid "Could not get fee levels"
msgstr "手数料のレベルを取得できませんでした。"
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr "請求の取得ができませんでした"
@@ -712,21 +745,21 @@ msgstr "請求の取得ができませんでした"
msgid "Could not get transactions"
msgstr "取引を取得できませんでした。"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "インポートできませんでした。"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
msgid "Could not import. Check input file and spending password"
msgstr "インポートできませんでした。入力ファイルとパスワードが正しいかご確認下さい。"
-#: src/js/services/profileService.js:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "ウォレットに参加できませんでした。"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "送金を却下できませんでした。"
@@ -743,22 +776,22 @@ msgstr "カードを削除できませんでした。"
msgid "Could not save preferences on the server"
msgstr "設定をサーバーと同期できませんでした。"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "送金できませんでした。"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr "取引が送れませんでした"
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "取引履歴を更新できませんでした。"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -778,7 +811,7 @@ msgstr "共有ウォレットを作成"
msgid "Create bitcoin wallet"
msgstr "ビットコインウォレット作成"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "新規ウォレット作成"
@@ -786,7 +819,7 @@ msgstr "新規ウォレット作成"
msgid "Create shared wallet"
msgstr "共有ウォレットを作成"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "{{formData.requiredCopayers}}-of-{{formData.totalCopayers}} ウォレットを作成"
@@ -816,7 +849,7 @@ msgstr "カスタム設定"
msgid "Custom Amount"
msgstr "金額を入力"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr "カスタム手数料"
@@ -851,14 +884,14 @@ msgstr "ウォレット削除中…"
msgid "Deleting payment proposal"
msgstr "送金の提案を削除"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "派生パス"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "派生パス"
@@ -870,7 +903,8 @@ msgid "Details"
msgstr "詳細"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "無効"
@@ -892,6 +926,14 @@ msgstr "ご自分の言語はCrowdinで見当たりませんか?Crowdinの管
msgid "Download"
msgstr "ダウンロード"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr ""
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+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."
msgstr "12個の単語から無限大のアドレスを生成することができ、それをビットコインウォレットと呼びます。送金を受け取る度に新しいアドレスを生成して受取画面でお見せします。"
@@ -917,6 +959,10 @@ msgstr "メールアドレス"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "未使用アドレスを生成しすぎたため、これ以上アドレスを生成することができません。"
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr ""
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "端末の設定でカメラの使用許可をしないとスキャンができません。"
@@ -933,8 +979,12 @@ msgstr "プッシュ通知を有効化"
msgid "Enable the camera to get started."
msgstr "始めるためにカメラを有効にして下さい。"
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr ""
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "送金時のパスワード入力して下さい。"
@@ -950,13 +1000,13 @@ msgstr "金額を入力"
msgid "Enter custom fee"
msgstr "カスタム手数料を入力"
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "新しい送金時パスワードを入力してください"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "復元フレーズの単語をご入力下さい。"
@@ -972,23 +1022,24 @@ msgstr "パスワードを入力して下さい。"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -998,32 +1049,33 @@ msgstr "パスワードを入力して下さい。"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1031,42 +1083,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "エラー"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "確認のエラー"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
msgstr "ギフトカード作成時にエラー"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr "請求の作成中にエラー"
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "ウォレット作成時にエラー"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr "全額送金データ取得時にエラー"
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr "支払い検証のエラー"
@@ -1078,7 +1132,7 @@ msgstr "Bitpayアカウントを接続中にエラー"
msgid "Error scanning funds:"
msgstr "残高確認に失敗しました"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "ペーパーウォレット出金時にエラー"
@@ -1090,7 +1144,7 @@ msgstr "デビットカードの更新エラー"
msgid "Exceeded daily limit of $500 per user"
msgstr "ユーザーの1日当たりの制限 500 米ドルを超えました"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1116,12 +1170,12 @@ msgstr "ファイルへのエクスポート"
msgid "Export wallet"
msgstr "ウォレットをエクスポート"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "このウォレットはQRによるエクスポートに対応していません"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "拡張公開鍵"
@@ -1190,12 +1244,12 @@ msgstr "指紋認証に失敗しました"
msgid "Finish"
msgstr "完了"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "監査用機能"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1209,7 +1263,7 @@ msgstr "送信者"
msgid "From BitPay account"
msgstr " BitPayアカウントから"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr "ハードウェアウォレットから"
@@ -1288,7 +1342,7 @@ msgstr "ギフトカードがもう使用できません。"
msgid "Gift card"
msgstr "ギフトカード"
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "期限切れのギフトカード"
@@ -1299,11 +1353,14 @@ msgstr "ギフトカードが利用可能になりました。"
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: 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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "戻る"
@@ -1319,8 +1376,8 @@ msgstr "戻る"
msgid "Got it"
msgstr "分かりました"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "ハードウェアウォレット"
@@ -1332,12 +1389,17 @@ msgstr "ハードウェアは接続されていません。"
msgid "Hardware wallet"
msgstr "ハードウェアウォレット"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr ""
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "ヘルプ&サポート"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "サポートに関する情報はウェブサイトに掲載しております。"
@@ -1349,17 +1411,17 @@ msgstr "非表示"
msgid "Hide Balance"
msgstr "残高を非表示"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "次のステップカードを非表示"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "詳細設定を非表示"
@@ -1389,9 +1451,9 @@ msgstr "利用規約をよく読み、
msgid "I have read, understood, and agree with the Terms of use."
msgstr "利用規約をよく読み、理解し、同意します。"
-#: www/views/join.html:134
-#: www/views/tab-create-personal.html:105
-#: www/views/tab-create-shared.html:134
+#: www/views/join.html:137
+#: www/views/tab-create-personal.html:107
+#: www/views/tab-create-shared.html:136
msgid "I have written it down"
msgstr "紙に書き留めました"
@@ -1424,11 +1486,11 @@ msgstr "紙に書き留めました"
msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected."
msgstr "有効にした場合は、このウォレットに関連する全ての秘密情報(秘密鍵と復元フレーズ)と履歴情報(送金やエクスポート)は守られます。"
-#: www/views/advancedSettings.html:22
+#: www/views/advancedSettings.html:23
msgid "If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab."
msgstr "有効にした場合、「最近の取引」カードがホームのメニューに表示されます。アプリに含まれる全ウォレットの取引が一覧できるカードです。"
-#: www/views/advancedSettings.html:13
+#: www/views/advancedSettings.html:14
msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays."
msgstr "有効にした場合、ウォレットは未承認ビットコインも送金時の候補に含めます。これを有効にした場合、承認に時間がかかることがあります。"
@@ -1445,7 +1507,7 @@ msgid "If you take a screenshot, your backup may be viewed by other apps. You ca
msgstr "画面写真を撮ってしまうと、その時点で他のアプリに見られるようになりますので、そのアプリの運営者が安易にビットコインを全て盗めます。安全にバックアップを取るには、紙とボールペンで書き留めましょう。"
#: www/views/tab-import-hardware.html:42
-#: www/views/tab-import-phrase.html:77
+#: www/views/tab-import-phrase.html:80
msgid "Import"
msgstr "インポート"
@@ -1453,7 +1515,7 @@ msgstr "インポート"
msgid "Import Wallet"
msgstr "ウォレットをインポート"
-#: www/views/tab-import-file.html:39
+#: www/views/tab-import-file.html:41
msgid "Import backup"
msgstr "バックアップをインポート"
@@ -1477,7 +1539,7 @@ msgstr "非アクティブ"
#: www/views/includes/walletItem.html:11
#: www/views/includes/walletSelector.html:18
#: www/views/tab-home.html:90
-#: www/views/tab-settings.html:117
+#: www/views/tab-settings.html:122
msgid "Incomplete"
msgstr "未完成"
@@ -1490,7 +1552,7 @@ msgid "Incorrect PIN, try again."
msgstr "PINが間違っています。もう一度やり直して下さい。"
#. Trying to import a malformed wallet export QR code
-#: src/js/controllers/import.js:70
+#: src/js/controllers/import.js:85
msgid "Incorrect code format"
msgstr "コードの形式が異なります"
@@ -1498,14 +1560,14 @@ msgstr "コードの形式が異なります"
msgid "Incorrect network address"
msgstr "サーバーのアドレスが不正です"
-#: src/js/controllers/confirm.js:112
-#: src/js/controllers/confirm.js:275
+#: src/js/controllers/confirm.js:114
+#: src/js/controllers/confirm.js:285
#: src/js/services/bwcError.js:44
msgid "Insufficient funds"
msgstr "残高不足"
-#: src/js/controllers/topup.js:164
-#: src/js/controllers/topup.js:176
+#: src/js/controllers/topup.js:165
+#: src/js/controllers/topup.js:177
#: src/js/services/bwcError.js:71
msgid "Insufficient funds for fee"
msgstr "手数料付けるには残高が足りません"
@@ -1514,15 +1576,15 @@ msgstr "手数料付けるには残高が足りません"
msgid "Invalid"
msgstr "無効"
-#: src/js/controllers/buyAmazon.js:136
-#: src/js/controllers/buyMercadoLibre.js:136
-#: src/js/controllers/topup.js:114
+#: src/js/controllers/buyAmazon.js:137
+#: src/js/controllers/buyMercadoLibre.js:137
+#: src/js/controllers/topup.js:115
msgid "Invalid URL"
msgstr "無効なURL"
-#: src/js/controllers/create.js:175
-#: src/js/controllers/import.js:327
-#: src/js/controllers/join.js:142
+#: src/js/controllers/create.js:186
+#: src/js/controllers/import.js:345
+#: src/js/controllers/join.js:151
msgid "Invalid account number"
msgstr "無効なポケット番号です。"
@@ -1534,9 +1596,9 @@ msgstr "不正アドレス"
msgid "Invalid data"
msgstr "無効のデータ"
-#: src/js/controllers/create.js:155
-#: src/js/controllers/import.js:249
-#: src/js/controllers/join.js:121
+#: src/js/controllers/create.js:161
+#: src/js/controllers/import.js:266
+#: src/js/controllers/join.js:125
msgid "Invalid derivation path"
msgstr "無効な派生パス"
@@ -1569,7 +1631,7 @@ msgstr "アドレスの再利用は避けましょう。これはプライバシ
msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again."
msgstr "正確に復元フレーズを書き留めることが大変重要です。このアプリやこの端末に問題が発生したりデータが破損したりすると、ビットコインの残高を元に戻すためには復元フレーズが必須になってきます。バックアップを再確認して、もう一度お試し下さい。"
-#: www/views/join.html:148
+#: www/views/join.html:151
msgid "Join"
msgstr "参加"
@@ -1595,7 +1657,7 @@ msgid "Key already associated with an existing wallet"
msgstr "この鍵は既存のウォレットにて登録されています"
#: www/views/preferencesLanguage.html:4
-#: www/views/tab-settings.html:53
+#: www/views/tab-settings.html:68
msgid "Language"
msgstr "言語設定"
@@ -1603,6 +1665,12 @@ msgstr "言語設定"
msgid "Last Month"
msgstr "先月"
+#: www/views/preferences.html:48
+#: www/views/preferencesCash.html:18
+#: www/views/tx-details.html:96
+msgid "Learn more"
+msgstr ""
+
#: www/views/backup.html:36
msgid "Let's verify your backup phrase."
msgstr "復元フレーズを確認しましょう。"
@@ -1616,7 +1684,7 @@ msgstr "アドレスを読み込んでいます..."
msgid "Loading transaction info..."
msgstr "取引情報の読み込み中..."
-#: www/views/tab-settings.html:95
+#: www/views/tab-settings.html:100
msgid "Lock App"
msgstr "アプリをロックする"
@@ -1665,7 +1733,7 @@ msgid "Matches:"
msgstr "結果:"
#: www/views/includes/copayers.html:4
-#: www/views/preferencesInformation.html:79
+#: www/views/preferencesInformation.html:85
msgid "Me"
msgstr "自分"
@@ -1673,7 +1741,7 @@ msgstr "自分"
msgid "Meh - it's alright"
msgstr "まあまあです"
-#: src/js/controllers/tx-details.js:148
+#: 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
@@ -1684,7 +1752,7 @@ msgstr "メモ"
msgid "Mercado Livre Brazil Gift Cards"
msgstr "Mercado Livre Brazil ギフトカード"
-#: src/js/controllers/buyMercadoLibre.js:97
+#: src/js/controllers/buyMercadoLibre.js:98
msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later."
msgstr "Mercadolibre Gift Card Service は現在ご利用できません、また後でお試しください"
@@ -1706,7 +1774,7 @@ msgstr "不足しているパラメータ"
msgid "Missing private keys to sign"
msgstr "署名するための秘密鍵がありません。"
-#: www/views/preferences.html:60
+#: www/views/preferences.html:61
#: www/views/preferencesAdvanced.html:3
msgid "More Options"
msgstr "その他オプション"
@@ -1716,7 +1784,7 @@ msgstr "その他オプション"
msgid "Moved"
msgstr "移動済"
-#: src/js/controllers/tx-details.js:114
+#: src/js/controllers/tx-details.js:131
msgid "Moved Funds"
msgstr "資金を移動済み"
@@ -1749,7 +1817,7 @@ msgstr "ネットワークにエラーが発生した"
msgid "New Proposal"
msgstr "新しい提案"
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:126
msgid "New address could not be generated. Please try again."
msgstr "アドレスを生成できませんでした。もう一度やり直してください。"
@@ -1765,8 +1833,8 @@ msgstr "次のステップ"
msgid "No Wallet"
msgstr "ウォレットが無いよ…(´・ω・`)"
-#: src/js/controllers/buyAmazon.js:114
-#: src/js/controllers/buyMercadoLibre.js:114
+#: src/js/controllers/buyAmazon.js:115
+#: src/js/controllers/buyMercadoLibre.js:115
msgid "No access key defined"
msgstr "アクセスキーが定義されていません"
@@ -1798,12 +1866,12 @@ msgstr "保留中の提案はありません"
msgid "No recent transactions"
msgstr "最近の取引がありません"
-#: src/js/controllers/buyAmazon.js:43
-#: src/js/controllers/topup.js:46
+#: src/js/controllers/buyAmazon.js:44
+#: src/js/controllers/topup.js:47
msgid "No signing proposal: No private key"
msgstr "提案に署名できない:秘密鍵がありません"
-#: www/views/walletDetails.html:192
+#: www/views/walletDetails.html:204
msgid "No transactions yet"
msgstr "取引がありません"
@@ -1815,10 +1883,10 @@ msgstr "ウォレットが見つかりません"
msgid "No wallet selected"
msgstr "ウォレットが選択されていません"
-#: src/js/controllers/buyAmazon.js:298
-#: src/js/controllers/buyMercadoLibre.js:290
-#: src/js/controllers/confirm.js:83
-#: src/js/controllers/topup.js:263
+#: src/js/controllers/buyAmazon.js:300
+#: src/js/controllers/buyMercadoLibre.js:292
+#: src/js/controllers/confirm.js:85
+#: src/js/controllers/topup.js:265
msgid "No wallets available"
msgstr "利用可能なウォレットがありません"
@@ -1826,6 +1894,14 @@ msgstr "利用可能なウォレットがありません"
msgid "No wallets available to receive funds"
msgstr "ペーパーウォレットの出金を受け取るためのウォレットが入っていません。"
+#: www/views/cashScan.html:14
+msgid "No wallets eligible for Bitcoin Cash support"
+msgstr ""
+
+#: www/views/cashScan.html:44
+msgid "Non eligible BTC wallets"
+msgstr ""
+
#: src/js/services/feeService.js:12
msgid "Normal"
msgstr "通常"
@@ -1834,7 +1910,7 @@ msgstr "通常"
msgid "Not authorized"
msgstr "権限がありません。"
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/confirm.js:286
msgid "Not enough funds for fee"
msgstr "手数料含めたら残高が不足しています。"
@@ -1860,7 +1936,7 @@ msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin"
msgstr "注意: ビットコインの売却は 1-of-1 (単一署名) のウォレットからしか行えません。"
#: www/views/preferencesNotifications.html:3
-#: www/views/tab-settings.html:46
+#: www/views/tab-settings.html:61
msgid "Notifications"
msgstr "通知設定"
@@ -1868,7 +1944,7 @@ msgstr "通知設定"
msgid "Notifications by email"
msgstr "メール通知"
-#: www/views/tx-details.html:117
+#: www/views/tx-details.html:119
msgid "Notify me if confirmed"
msgstr "取引承認時に通知"
@@ -1884,8 +1960,9 @@ msgstr "お金を受け取る前に、このウォレットのバックアップ
msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?"
msgstr "今一度周りの環境をよく見てみましょう。隠しカメラ、窓、覗いてくる人などありませんか?"
-#: src/js/controllers/buyAmazon.js:310
-#: src/js/controllers/topup.js:284
+#: src/js/controllers/buyAmazon.js:312
+#: src/js/controllers/topup.js:286
+#: src/js/services/incomingData.js:153
#: src/js/services/popupService.js:16
#: src/js/services/popupService.js:52
#: src/js/services/popupService.js:61
@@ -1909,7 +1986,7 @@ msgstr "公式免責事項 (英語)"
msgid "Oh no!"
msgstr "おっと!"
-#: src/js/controllers/buyMercadoLibre.js:304
+#: src/js/controllers/buyMercadoLibre.js:306
msgid "Ok"
msgstr "OK"
@@ -1918,7 +1995,10 @@ msgid "On this screen you can see all your wallets, accounts, and assets."
msgstr "この画面では、全てのウォレット、アカウント、資産が閲覧できます。"
#: src/js/controllers/bitpayCard.js:113
-#: src/js/controllers/tab-settings.js:47
+#: src/js/controllers/preferences.js:66
+#: src/js/controllers/preferencesCash.js:33
+#: src/js/controllers/tab-settings.js:51
+#: src/js/controllers/tx-details.js:55
msgid "Open"
msgstr "開く"
@@ -1935,7 +2015,7 @@ msgid "Open GitHub Project"
msgstr "GitHub のプロジェクトを開く"
#: src/js/controllers/bitpayCard.js:123
-#: src/js/controllers/tx-details.js:175
+#: src/js/controllers/tx-details.js:192
msgid "Open Insight"
msgstr "Insightを開く"
@@ -1951,6 +2031,10 @@ msgstr "翻訳ページを開く"
msgid "Open Website"
msgstr "サイトを開く"
+#: src/js/controllers/preferencesCash.js:32
+msgid "Open bitcoincash.org?"
+msgstr ""
+
#: www/views/tab-receive.html:27
msgid "Open wallet"
msgstr "ウォレットを開く"
@@ -1963,18 +2047,18 @@ msgstr "サイトを開く"
msgid "Order the BitPay Card"
msgstr "BitPay カードを申し込み"
-#: www/views/join.html:102
-#: www/views/join.html:93
-#: www/views/tab-create-personal.html:67
-#: www/views/tab-create-personal.html:75
-#: www/views/tab-create-shared.html:104
-#: www/views/tab-create-shared.html:96
+#: www/views/join.html:105
+#: www/views/join.html:96
+#: www/views/tab-create-personal.html:69
+#: www/views/tab-create-personal.html:77
+#: www/views/tab-create-shared.html:106
+#: www/views/tab-create-shared.html:98
#: www/views/tab-import-file.html:18
-#: www/views/tab-import-phrase.html:38
+#: www/views/tab-import-phrase.html:41
msgid "Password"
msgstr "パスワード"
-#: src/js/controllers/import.js:83
+#: src/js/controllers/import.js:98
msgid "Password required. Make sure to enter your password in advanced options"
msgstr "パスワードが必要です。上級者向け設定にてパスワードを入力してください。"
@@ -1994,7 +2078,7 @@ msgstr "0% 手数料でビットコインを米ドルに替える"
msgid "Pay To"
msgstr "支払い先"
-#: src/js/controllers/modals/txpDetails.js:45
+#: src/js/controllers/modals/txpDetails.js:51
#: www/views/modals/tx-status.html:33
msgid "Payment Accepted"
msgstr "支払いが完了しました"
@@ -2032,7 +2116,7 @@ msgstr "送金が受領されました"
msgid "Payment Rejected"
msgstr "送金が却下されました"
-#: src/js/controllers/modals/txpDetails.js:42
+#: src/js/controllers/modals/txpDetails.js:44
#: www/views/confirm.html:126
#: www/views/includes/walletActivity.html:11
#: www/views/modals/txp-details.html:42
@@ -2047,6 +2131,10 @@ msgstr "取引が承認されましたが、まだ送信していません。"
msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created."
msgstr "取引が承認されました。Glideraより送信されます。問題があった場合、送金命令を出す6時間以内に取り消すことができます。"
+#: src/js/services/incomingData.js:152
+msgid "Payment address was translated to new Bitcoin Cash address format:"
+msgstr ""
+
#: www/views/modals/txp-details.html:109
msgid "Payment details"
msgstr "支払いの詳細"
@@ -2068,7 +2156,7 @@ msgstr "保留中の提案"
msgid "Permanently delete this wallet."
msgstr "ウォレットを完全に削除する"
-#: src/js/services/profileService.js:388
+#: src/js/services/profileService.js:401
msgid "Personal Wallet"
msgstr "個人用ウォレット"
@@ -2080,12 +2168,12 @@ msgstr "丁寧に復元フレーズを紙に書き留めて下さい"
msgid "Please connect a camera to get started."
msgstr "始めるためにカメラを接続して下さい。"
-#: src/js/controllers/import.js:260
+#: src/js/controllers/import.js:277
msgid "Please enter the recovery phrase"
msgstr "復元フレーズをご入力下さい"
-#: src/js/controllers/create.js:168
-#: src/js/controllers/join.js:135
+#: src/js/controllers/create.js:174
+#: src/js/controllers/join.js:139
msgid "Please enter the wallet recovery phrase"
msgstr "復元フレーズをご入力下さい"
@@ -2101,7 +2189,12 @@ msgstr "正しい順序で各単語をタップしてください。"
msgid "Please upgrade Copay to perform this action"
msgstr "この操作を実行するにはCopayを最新バージョンに更新してください"
-#: src/js/controllers/import.js:222
+#: www/views/walletDetails.html:142
+#: www/views/walletDetails.html:62
+msgid "Please wait"
+msgstr ""
+
+#: src/js/controllers/import.js:238
msgid "Please, select your backup file"
msgstr "バックアップファイルを選択"
@@ -2121,7 +2214,7 @@ msgstr "アドレスを処理中…"
msgid "Preparing backup..."
msgstr "バックアップを準備中..."
-#: src/js/routes.js:1240
+#: src/js/routes.js:1261
msgid "Press again to exit"
msgstr "もう一度押して終了"
@@ -2133,7 +2226,7 @@ msgstr "優先"
msgid "Private Key"
msgstr "秘密鍵"
-#: src/js/controllers/paperWallet.js:137
+#: src/js/controllers/paperWallet.js:136
msgid "Private key encrypted. Enter password"
msgstr "秘密鍵は暗号化されています。復号化パスワードを入力して下さい。"
@@ -2145,8 +2238,8 @@ msgstr "秘密鍵が暗号化されており署名できません。"
msgid "Proposal Accepted"
msgstr "提案が承諾されました"
-#: src/js/controllers/modals/txpDetails.js:55
-#: src/js/controllers/tx-details.js:61
+#: src/js/controllers/modals/txpDetails.js:61
+#: src/js/controllers/tx-details.js:78
#: www/views/confirm.html:127
msgid "Proposal Created"
msgstr "提案が作成されました"
@@ -2159,15 +2252,15 @@ msgstr "提案が削除されました"
msgid "Proposal Rejected"
msgstr "提案が却下されました"
-#: www/views/walletDetails.html:177
+#: www/views/walletDetails.html:189
msgid "Proposals"
msgstr "提案"
-#: src/js/controllers/buyAmazon.js:281
+#: src/js/controllers/buyAmazon.js:282
msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day"
msgstr "購入額が一日最大 {{limitPerDay}} {{currency}} になります。"
-#: src/js/controllers/buyMercadoLibre.js:280
+#: src/js/controllers/buyMercadoLibre.js:281
msgid "Purchase amount must be a value between 50 and 2000"
msgstr "購入金額は 50〜2000 の間の値でなければなりません"
@@ -2187,8 +2280,8 @@ msgstr "QRコード"
msgid "Quick review!"
msgstr "おさらい!"
-#: src/js/controllers/create.js:79
-#: src/js/controllers/join.js:65
+#: src/js/controllers/create.js:84
+#: src/js/controllers/join.js:68
msgid "Random"
msgstr "乱数"
@@ -2204,6 +2297,11 @@ msgstr "非表示にする"
msgid "Read more"
msgstr "もっと読む"
+#: src/js/controllers/preferences.js:65
+#: src/js/controllers/tx-details.js:54
+msgid "Read more in our Wiki"
+msgstr ""
+
#: www/views/tab-receive.html:3
#: www/views/tabs.html:7
msgid "Receive"
@@ -2218,7 +2316,7 @@ msgstr "通貨"
msgid "Received"
msgstr "受取済み"
-#: src/js/controllers/tx-details.js:113
+#: src/js/controllers/tx-details.js:130
msgid "Received Funds"
msgstr "受領した資金"
@@ -2232,7 +2330,7 @@ msgstr "受け取り中"
msgid "Recent"
msgstr "履歴"
-#: www/views/advancedSettings.html:20
+#: www/views/advancedSettings.html:21
msgid "Recent Transaction Card"
msgstr "最近の取引カード"
@@ -2254,11 +2352,6 @@ msgstr "受取人"
msgid "Recovery phrase"
msgstr "復元フレーズ"
-#: www/views/walletDetails.html:116
-#: www/views/walletDetails.html:36
-msgid "Recreate"
-msgstr "再登録"
-
#: src/js/services/onGoingProcess.js:26
msgid "Recreating Wallet..."
msgstr "ウォレットを再作成中…"
@@ -2267,8 +2360,8 @@ msgstr "ウォレットを再作成中…"
msgid "Redeem now"
msgstr "今すぐ引き換えをする"
-#: src/js/controllers/modals/txpDetails.js:57
-#: src/js/controllers/tx-details.js:63
+#: src/js/controllers/modals/txpDetails.js:63
+#: src/js/controllers/tx-details.js:80
msgid "Rejected"
msgstr "却下済み"
@@ -2297,12 +2390,12 @@ msgstr "BitPay カードを削除しますか?"
msgid "Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?"
msgstr "BitPay アカウントを削除すると、このデバイスからすべての関連付けられている BitPay のアカウントデータが削除されます。本当にこのデバイスから BitPay アカウント ({{email}}) を削除してもよろしいですか。"
-#: www/views/join.html:113
-#: www/views/join.html:121
-#: www/views/tab-create-personal.html:84
-#: www/views/tab-create-personal.html:92
-#: www/views/tab-create-shared.html:113
-#: www/views/tab-create-shared.html:121
+#: www/views/join.html:116
+#: www/views/join.html:124
+#: www/views/tab-create-personal.html:86
+#: www/views/tab-create-personal.html:94
+#: www/views/tab-create-shared.html:115
+#: www/views/tab-create-shared.html:123
#: www/views/tab-export-file.html:17
msgid "Repeat password"
msgstr "パスワードを再入力"
@@ -2311,7 +2404,7 @@ msgstr "パスワードを再入力"
msgid "Repeat the password"
msgstr "パスワードの再入力"
-#: www/views/preferences.html:55
+#: www/views/preferences.html:56
msgid "Request Fingerprint"
msgstr "指紋を要求"
@@ -2323,7 +2416,7 @@ msgstr "指定金額を要求"
msgid "Request Spending Password"
msgstr "送金時のパスワード入力"
-#: www/views/tab-create-shared.html:42
+#: www/views/tab-create-shared.html:44
msgid "Required number of signatures"
msgstr "必要な署名の数を選択"
@@ -2372,10 +2465,18 @@ msgstr "もう一度スキャンし直してください。"
msgid "Scan your fingerprint please"
msgstr "指紋をスキャンしてください"
+#: www/views/preferencesCash.html:22
+msgid "Scan your wallets for Bitcoin Cash"
+msgstr ""
+
#: src/js/services/onGoingProcess.js:30
msgid "Scanning Wallet funds..."
msgstr "ウォレット残高照会中…"
+#: www/views/tab-home.html:95
+msgid "Scanning funds..."
+msgstr ""
+
#: www/views/includes/screenshotWarningModal.html:7
msgid "Screenshots are not secure"
msgstr "画面写真を撮ってしまうと危険です!"
@@ -2408,7 +2509,7 @@ msgstr "請求書を表示"
msgid "Select a backup file"
msgstr "バックアップファイルを選択"
-#: src/js/controllers/tab-receive.js:133
+#: src/js/controllers/tab-receive.js:139
msgid "Select a wallet"
msgstr "ウォレットを選択"
@@ -2445,7 +2546,7 @@ msgstr "ビットコインアドレスをメールにて共有"
msgid "Send by email"
msgstr "メールで送信"
-#: src/js/controllers/confirm.js:151
+#: src/js/controllers/confirm.js:156
msgid "Send from"
msgstr "ここから送金"
@@ -2484,7 +2585,7 @@ msgstr "全残高を送金"
msgid "Sending transaction"
msgstr "取引送信中"
-#: src/js/controllers/confirm.js:490
+#: src/js/controllers/confirm.js:524
msgid "Sending {{amountStr}} from your {{name}} wallet"
msgstr "ウォレット {{name}} から {{amountStr}} の送金を行います。"
@@ -2495,7 +2596,7 @@ msgstr "ウォレット {{name}} から {{amountStr}} の送金を行います
msgid "Sent"
msgstr "送金済み"
-#: src/js/controllers/tx-details.js:112
+#: src/js/controllers/tx-details.js:129
msgid "Sent Funds"
msgstr "資金を送金済み"
@@ -2503,8 +2604,8 @@ msgstr "資金を送金済み"
msgid "Server response could not be verified"
msgstr "サーバーからの返答を検証できませんでした"
-#: src/js/controllers/buyAmazon.js:96
-#: src/js/controllers/buyMercadoLibre.js:96
+#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyMercadoLibre.js:97
msgid "Service not available"
msgstr "このサービスは利用できません"
@@ -2524,7 +2625,7 @@ msgstr "セッションのログ"
msgid "Set up a password"
msgstr "パスワードを設定"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Set your own fee in satoshis/byte"
msgstr "カスタム手数料は satoshis/byte で指定"
@@ -2561,13 +2662,13 @@ msgstr "復元フレーズを表示"
msgid "Show address"
msgstr "アドレスを表示"
-#: www/views/join.html:45
-#: www/views/tab-create-personal.html:25
-#: www/views/tab-create-shared.html:54
+#: www/views/join.html:48
+#: www/views/tab-create-personal.html:27
+#: www/views/tab-create-shared.html:56
#: www/views/tab-export-file.html:24
-#: www/views/tab-import-file.html:27
+#: www/views/tab-import-file.html:29
#: www/views/tab-import-hardware.html:30
-#: www/views/tab-import-phrase.html:32
+#: www/views/tab-import-phrase.html:35
msgid "Show advanced options"
msgstr "詳細設定を表示"
@@ -2591,8 +2692,8 @@ msgstr "取引署名中"
msgid "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted."
msgstr "ビットコインの管理は全てご自身でしていただくため、端末やアプリの不具合や削除に備えるために復元フレーズを書き留めていただきます。"
-#: www/views/tab-create-personal.html:120
-#: www/views/tab-create-shared.html:149
+#: www/views/tab-create-personal.html:122
+#: www/views/tab-create-shared.html:151
msgid "Single Address Wallet"
msgstr "単一アドレスウォレット"
@@ -2601,17 +2702,27 @@ msgstr "単一アドレスウォレット"
msgid "Skip"
msgstr "スキップ"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Slide"
-msgstr "スライドして"
+#: src/js/controllers/confirm.js:350
+#: 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/create.js:83
-#: src/js/controllers/join.js:68
+#: src/js/controllers/confirm.js:344
+msgid "Slide to pay"
+msgstr ""
+
+#: src/js/controllers/confirm.js:356
+#: src/js/controllers/modals/txpDetails.js:40
+msgid "Slide to send"
+msgstr ""
+
+#: src/js/controllers/create.js:88
+#: src/js/controllers/join.js:71
msgid "Specify Recovery Phrase..."
msgstr "復元フレーズを指定…"
@@ -2627,7 +2738,7 @@ msgstr "送金の提案が見つかりませんでした。"
msgid "Spending Password needed"
msgstr "パスワードが必要"
-#: www/views/walletDetails.html:161
+#: www/views/walletDetails.html:173
msgid "Spending this balance will need significant Bitcoin network fees"
msgstr "この入力の組み合わせを送金するために膨大なビットコインネットワーク手数料を必要とします"
@@ -2652,6 +2763,10 @@ msgstr "成功"
msgid "Super Economy"
msgstr "超節約"
+#: www/views/preferencesCash.html:11
+msgid "Support Bitcoin Cash"
+msgstr ""
+
#: www/views/paperWallet.html:7
msgid "Sweep"
msgstr "全残高インポート"
@@ -2673,13 +2788,16 @@ msgstr "***注意*** このアクションを元に戻すことは
msgid "Take control of your money,
get started with bitcoin."
msgstr "お金のコントロールを取り戻そう、
ビットコインをはじめよう"
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "長押しで表示"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr ""
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "タップしてやり直し"
@@ -2694,8 +2812,8 @@ msgstr "利用規約"
msgid "Terms of Use"
msgstr "利用規約"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "テスト用ネットワーク"
@@ -2758,7 +2876,7 @@ msgstr "英語公式の規約は BitPay のウェブサイトにてご覧いた
msgid "The password of the recovery phrase (if set)"
msgstr "復元フレーズ用のパスワード(設定してある場合のみ)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "送金の提案は作成されましたが完了できませんでした。ホーム画面からやり直して下さい。"
@@ -2766,10 +2884,10 @@ msgstr "送金の提案は作成されましたが完了できませんでした
msgid "The payment was removed by creator"
msgstr "送金の提案が作成者により削除されました"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "復元フレーズにパスワードをかけることが\n"
"できるのでかけてある場合は\n"
@@ -2803,9 +2921,9 @@ msgstr "ウォレットサービスのURL"
msgid "There is a new version of {{appName}} available"
msgstr "{{appName}} の新しいバージョンがあります。"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "フォームにエラーがありました"
@@ -2822,13 +2940,13 @@ msgstr "このアプリは素晴らしいです!"
msgid "This app stores your bitcoin with cutting-edge security."
msgstr "このアプリは、最先端のセキュリティであなたのビットコインをお守りします。"
-#: src/js/controllers/confirm.js:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "ビットコインペイメントの請求期限が切れています。"
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "このパスワードは復元できません。リセットすることができません。弊社のサーバーで管理するものではありません。復元フレーズとセットで必ず書き留めておいて下さい。復元フレーズとこのパスワードのどれかを忘れてしまうと、ビットコインを復元することができません。ご注意下さい。"
@@ -2844,13 +2962,13 @@ msgstr "この取引の金額はビットコインネットワーク手数料よ
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "この取引は承認されるまで非常に時間のかかる可能性があります。承認されずにネットワークに捨てられてしまう危険性もありますので、承認されるまでお待ちいただくことを強くおすすめします。"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "履歴"
@@ -2879,7 +2997,7 @@ msgstr "{{reason}}:その前にBitPayアカウントを追加する必要が
msgid "Top up in progress..."
msgstr "残高補充処理中..."
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr "デビットカード ({{cardLastNumber}}) に {{amountStr}} の入金を行う"
@@ -2890,11 +3008,11 @@ msgstr "デビットカード ({{cardLastNumber}}) に {{amountStr}} の入金
msgid "Total"
msgstr "合計"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "ロック中の残高"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "参加人数を選択して下さい。"
@@ -2907,7 +3025,7 @@ msgstr "合計ウォレット入力"
msgid "Touch ID Failed"
msgstr "Touch ID が失敗しました。"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "取引"
@@ -2924,9 +3042,9 @@ msgstr "取引履歴"
msgid "Transaction already broadcasted"
msgstr "取引は既に配信されました。"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr "取引が未作成です"
@@ -2934,7 +3052,7 @@ msgstr "取引が未作成です"
msgid "Transaction initiated"
msgstr "取引が開始されました"
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "現在この取引はご覧いただけません。"
@@ -2947,7 +3065,7 @@ msgstr "取引は見つかりません"
msgid "Transactions without fee are not supported."
msgstr "手数料なしの取引はサポートされていません。"
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr "移動先"
@@ -2971,15 +3089,11 @@ msgstr "復元フレーズの単語 (通常 12 個) を入力して下さい。"
msgid "Uh oh..."
msgstr "あら…"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "未承認"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "単位"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "未送信取引"
@@ -2999,7 +3113,7 @@ msgstr "利用可能なアップデートあり"
msgid "Updating pending proposals. Please stand by"
msgstr "協議中の送金提案を更新します。しばらくお待ちください。"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "取引履歴を更新します。しばらくお待ちください。"
@@ -3011,7 +3125,7 @@ msgstr "更新中... お待ち下さい"
msgid "Urgent"
msgstr "緊急"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "未承認ビットコインを使用"
@@ -3041,7 +3155,7 @@ msgid "View Terms of Service"
msgstr "サービス利用規約を表示"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Insightにて取引を表示"
@@ -3049,7 +3163,7 @@ msgstr "Insightにて取引を表示"
msgid "View Update"
msgstr "更新情報を表示"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "ブロックチェーンで詳細を閲覧"
@@ -3057,7 +3171,7 @@ msgstr "ブロックチェーンで詳細を閲覧"
msgid "Visit mercadolivre.com.br →"
msgstr "mercadolivre.com.br を訪れる →"
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "注意:このデバイスでは鍵の派生がちゃんと動いておりません。このウォレットは正常に動作しません。"
@@ -3098,7 +3212,7 @@ msgstr "ウォレットのアドレス"
msgid "Wallet Color"
msgstr "ウォレットの色"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "ウォレット構成 (m-of-n)"
@@ -3106,7 +3220,7 @@ msgstr "ウォレット構成 (m-of-n)"
msgid "Wallet Created"
msgstr "ウォレットが作成されました"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "ウォレットID"
@@ -3123,9 +3237,9 @@ msgstr "ウォレットの入力"
msgid "Wallet Invitation"
msgstr "ウォレット招待"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "ウォレットの鍵"
@@ -3137,13 +3251,13 @@ msgstr "ウォレット名"
msgid "Wallet Name (at creation)"
msgstr "ウォレット名 (作成時)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "ウォレットのネットワーク"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "復元フレーズ"
@@ -3152,7 +3266,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "ウォレットシードが不正です。"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "ウォレットサービスのURL"
@@ -3161,7 +3275,7 @@ msgid "Wallet Settings"
msgstr "ウォレットの設定"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "ウォレットタイプ"
@@ -3169,7 +3283,7 @@ msgstr "ウォレットタイプ"
msgid "Wallet already exists"
msgstr "既存のウォレットです"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
msgstr "{{appName}}内の既存のウォレットです"
@@ -3203,7 +3317,7 @@ msgid "Wallet needs backup"
msgstr "ウォレットバックアップが必要"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "ウォレットがバックアップされていません"
@@ -3211,6 +3325,7 @@ msgstr "ウォレットがバックアップされていません"
msgid "Wallet not found"
msgstr "ウォレットが見つかりません。"
+#: src/js/controllers/cashScan.js:65
#: src/js/controllers/tab-home.js:220
msgid "Wallet not registered"
msgstr "ウォレットが未登録"
@@ -3231,13 +3346,13 @@ msgstr "Wallet serviceが見つかりません。"
msgid "Wallets"
msgstr "ウォレット"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "ウォレットと連動"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3300,7 +3415,7 @@ msgstr "アプリケーションストアにレビューを書いてみません
msgid "Would you like to receive push notifications about payments?"
msgstr "送金発生時にプッシュ通知を受け取りますか?"
-#: src/js/controllers/import.js:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "単語の数が間違っています:"
@@ -3410,19 +3525,24 @@ msgstr "ご購入の品物が保留中のリストに追加されました。"
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "ウォレットは一度もクラウドへ保存されたりすることはありませんし、携帯電話などに付いている標準バックアップ機能ではバックアップされません!!!!"
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[残高非表示中]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr ""
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "BitPay VISAカードを追加します"
@@ -3431,7 +3551,7 @@ msgstr "BitPay VISAカードを追加します"
msgid "locked by pending payments"
msgstr "未対応送金の提案によりロック中"
-#: src/js/services/profileService.js:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "自分"
@@ -3443,25 +3563,11 @@ msgstr "name@example.com"
msgid "preparing..."
msgstr "準備中..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "承諾する"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "支払う"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "送金する"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} を Amazon.com ギフトカードに"
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
msgstr "{{amountStr}} を Mercado Livre Brazil ギフトカードに"
@@ -3469,7 +3575,7 @@ 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:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} のビットコインネットワーク手数料が差し引かれます。"
@@ -3477,12 +3583,13 @@ msgstr "{{fee}} のビットコインネットワーク手数料が差し引か
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "送金額に対する {{tx.txp[wallet.id].feeRatePerStr}}"
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} 個の取引ダウンロード済み"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-of-{{wallet.n}}"
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index d7b05958a..46616bf00 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-08-16 09:23-0400\n"
+"PO-Revision-Date: 2017-09-19 14:07-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -48,31 +48,31 @@ 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:351
+#: src/js/controllers/confirm.js:380
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:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "O programie"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "Zatwierdzono"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "Konto"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "Numer konta"
@@ -106,9 +106,9 @@ msgstr "Dodaj środki"
msgid "Add Memo"
msgstr "Dodaj notatkę"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "Dodaj hasło"
@@ -116,9 +116,9 @@ msgstr "Dodaj hasło"
msgid "Add account"
msgstr "Dodaj konto"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "Dodaj opcjonalnie hasło w celu zabezpieczenia kluczowej frazy"
@@ -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:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "Dodaj opis"
@@ -153,7 +153,7 @@ msgstr "Adres"
msgid "Address Book"
msgstr "Książka adresowa"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "Rodzaj adresu"
@@ -161,7 +161,7 @@ msgstr "Rodzaj adresu"
msgid "Addresses With Balance"
msgstr "Adresy z funduszami"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "Zaawansowane"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "Prawie gotowe! Dokonajmy przeglądu."
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "Alternatywna waluta"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr "Amazon.com jest aktualnie niedostępny. Spróbuj później."
@@ -216,7 +216,7 @@ msgstr "Kwota"
msgid "Amount below minimum allowed"
msgstr "Kwota poniżej minimum dozwolona"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "Zbyt duża kwota"
@@ -256,11 +256,11 @@ msgstr "Czy na pewno chcesz usunąć ten kontakt?"
msgid "Are you sure you want to delete this wallet?"
msgstr "Czy na pewno chcesz usunąć ten portfel?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "Czy na pewno chcesz odrzucić tę transakcję?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "Czy na pewno chcesz usunąć tę transakcję?"
@@ -277,7 +277,7 @@ msgstr "Czy na pewno chcesz się wylogować z konta BitPay Card?"
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "Czy na pewno chcesz usunąć kartę BitPay ({{lastFourDigits}}) z tego urządzenia?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "Weryfikowalny"
@@ -294,13 +294,17 @@ msgstr "Dostępne saldo"
msgid "Average confirmation time"
msgstr "Spodziewany czas potwierdzania"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "BIP32 ścieżka dla adresu derywacji"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr ""
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "Kopia zapasowa"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "Zrób kopię zapasową wszystkich swoich portfeli przed użyciem tej funkcji"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Potrzebna kopia zapasowa"
@@ -331,11 +335,11 @@ 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:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "Nieprawidłowe zaproszenie"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "Saldo wg adresu"
@@ -352,15 +356,24 @@ msgstr "Karty BitPay Visa®"
msgid "Bitcoin Address"
msgstr "Adres bitcoin"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr ""
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Polityka prowizji sieci bitcoin"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Jednostki bitcoina"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr ""
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -386,8 +399,8 @@ msgstr "Kupiono {{amountUnitStr}}"
msgid "Broadcast Payment"
msgstr "Przekaż płatność"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "Nadawane"
@@ -417,7 +430,7 @@ msgstr "Kup bitcoiny"
msgid "Buy a Gift Card"
msgstr ""
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
msgstr "Kup od"
@@ -429,10 +442,11 @@ msgstr "Zakup bitcoinów..."
msgid "Calculating fee"
msgstr "Obliczanie prowizji"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr "Anuluj zaproszenie"
msgid "Cannot Create Wallet"
msgstr "Nie można utworzyć portfela"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "Nie można dołączyć tego samego portfela więcej niż raz"
@@ -491,9 +505,19 @@ msgstr "Wyczyść"
msgid "Clear cache"
msgstr "Wyczyść pamięć podręczną"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "Kliknij"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr ""
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr ""
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr ""
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "Kliknij"
msgid "Close"
msgstr "Zamknij"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr ""
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "Kolor"
@@ -513,7 +542,7 @@ msgstr "Kolor"
msgid "Commit hash"
msgstr "Zatwierdzony hash"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "Zakończ proces tworzenia kopii zapasowej, aby użyć tej opcji"
@@ -521,11 +550,11 @@ msgstr "Zakończ proces tworzenia kopii zapasowej, aby użyć tej opcji"
msgid "Completed"
msgstr "Zakończono"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -547,11 +576,11 @@ msgstr "Potwierdź zakup"
msgid "Confirm your PIN"
msgstr "Potwierdź kod PIN"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "Potwierdź nowe hasło wypłat"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "Potwierdzenia"
@@ -604,7 +633,7 @@ msgstr "Niezgodność danych współwłaściciela portfela"
msgid "Copayer joined"
msgstr "Współwłaściciel dołączył"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Współwłaściciele {{$index}}"
@@ -626,7 +655,7 @@ msgstr "Skopiuj ten tekst w bezpiecznym miejscu (notatnik lub e-mail)"
msgid "Copy to clipboard"
msgstr "Skopiuj do schowka"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
msgstr ""
@@ -634,19 +663,19 @@ msgstr ""
msgid "Could not access the wallet at the server. Please check:"
msgstr "Nie można uzyskać dostępu do portfela na serwerze. Proszę sprawdzić:"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr "Nie może uzyskać dostępu do Amazon.com"
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "Nie można uzyskać dostępu do portfela"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Nie można dodać wiadomość do importowanego portfela bez udostępnionego klucza szyfrowania"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "Wypłata nie może zostać wysłana"
@@ -654,45 +683,49 @@ msgstr "Wypłata nie może zostać wysłana"
msgid "Could not build transaction"
msgstr "Nie udało się utworzyć transakcji"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "Nie można utworzyć adresu"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr "Nie można utworzyć faktury"
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr "Nie można utworzyć transakcji"
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
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:353
+#: src/js/services/profileService.js:363
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:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Nie można utworzyć: niepoprawna kluczowa fraza"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "Nie można odszyfrować pliku, sprawdź hasło"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "Nie można usunąć wniosku wypłaty"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr ""
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "Nie można pobrać dynamicznej prowizji"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "Nie można uzyskać dynamicznej prowizji dla poziomu: {{feeLevel}}"
@@ -700,9 +733,9 @@ msgstr "Nie można uzyskać dynamicznej prowizji dla poziomu: {{feeLevel}}"
msgid "Could not get fee levels"
msgstr "Nie można uzyskać poziomów prowizji"
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr "Nie można pobrać faktury"
@@ -710,21 +743,21 @@ msgstr "Nie można pobrać faktury"
msgid "Could not get transactions"
msgstr "Nie można pobrać transakcji"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "Nie można zaimportować"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
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:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "Nie można dołączyć portfela"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "Wypłata nie może być odrzucona"
@@ -741,22 +774,22 @@ msgstr "Nie można usunąć karty"
msgid "Could not save preferences on the server"
msgstr "Nie można zapisać ustawień na serwerze"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "Wypłata nie może zostać wysłana"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr "Nie można wysłać transakcji"
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "Nie można zaktualizować historii transakcji"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "Utwórz współdzielony portfel"
msgid "Create bitcoin wallet"
msgstr "Utwórz portfel bitcoin"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "Utwórz nowy portfel"
@@ -784,7 +817,7 @@ msgstr "Utwórz nowy portfel"
msgid "Create shared wallet"
msgstr "Utwórz współdzielony portfel"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Utwórz portfel {{formData.requiredCopayers}} z {{formData.totalCopayers}}"
@@ -814,7 +847,7 @@ msgstr "Niestandardowy"
msgid "Custom Amount"
msgstr "Kwota własna"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr "Niestandardowa Prowizja"
@@ -849,14 +882,14 @@ msgstr "Usuwanie portfela..."
msgid "Deleting payment proposal"
msgstr "Usuń propozycję płatności"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "Ścieżka derywacji"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "Strategia derywacji"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr "Szczegóły"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Wyłącz"
@@ -890,6 +924,14 @@ msgstr "Nie widzisz swojego języka na Crowdin? Skontaktuj się z właścicielem
msgid "Download"
msgstr "Pobierz"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr ""
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+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."
msgstr "Każdy portfel bitcoin może wygenerować miliardy adresów z twojej 12-wyrazowej kopii zapasowej. Nowy adres jest automatycznie generowany i pokazany za każdym razem, kiedy otrzymasz płatność."
@@ -915,6 +957,10 @@ msgstr "Adres e-mail"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "Puste adresy osiągnęły limit. Nowe adresy nie mogą być generowane."
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr ""
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "Udostępnij kamerę w ustawieniach urządzenia, aby rozpocząć pracę."
@@ -931,8 +977,12 @@ msgstr "Włącz powiadomienia"
msgid "Enable the camera to get started."
msgstr "Włącz kamerę aby rozpocząć."
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr ""
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "Wprowadź hasło wypłaty"
@@ -948,13 +998,13 @@ msgstr ""
msgid "Enter custom fee"
msgstr "Wprowadź niestandardową kwotę prowizji"
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "Wprowadź nowe hasło wypłaty"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "Wprowadź kluczową frazę (BIP39)"
@@ -970,23 +1020,24 @@ msgstr "Wprowadź hasło"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "Wprowadź hasło"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "Błąd"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "Błąd w potwierdzeniu"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
msgstr "Błąd przy tworzeniu karty upominkowej"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr ""
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "Błąd podczas tworzenia portfela"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr "Wystąpił błąd podczas uzyskiwania informacji SendMax"
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr "Błąd w protokole płatności"
@@ -1076,7 +1130,7 @@ msgstr "Błąd parowania konta Bitpay"
msgid "Error scanning funds:"
msgstr "Błąd skanowania środków:"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "Błąd opróżniania portfela:"
@@ -1088,7 +1142,7 @@ msgstr "Błąd aktualizacji kart debetowych"
msgid "Exceeded daily limit of $500 per user"
msgstr "Dzienny limit 500$ na użytkownika został przekroczony"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,12 +1168,12 @@ msgstr "Eksportuj do pliku"
msgid "Export wallet"
msgstr "Eksportuj portfel"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "Dla tego portfela nie jest obsługiwany eksport za pomocą kodu QR"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "Rozszerzone klucze publiczne"
@@ -1188,12 +1242,12 @@ msgstr "Skanowanie odcisku nie powiodło się"
msgid "Finish"
msgstr "Zakończ"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "Do celów audytu"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "Z"
msgid "From BitPay account"
msgstr "Z konta BitPay"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr "Z portfela sprzętowego"
@@ -1286,7 +1340,7 @@ msgstr ""
msgid "Gift card"
msgstr "Karta podarunkowa"
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "Karta upominkowa wygasła"
@@ -1297,11 +1351,14 @@ msgstr "Karta podarunkowa wygenerowana i gotowa do użycia."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: 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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Powrót"
@@ -1317,8 +1374,8 @@ msgstr "Powrót"
msgid "Got it"
msgstr "Rozumiem"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "Portfel sprzętowy"
@@ -1330,12 +1387,17 @@ msgstr "Sprzęt nie podłączony."
msgid "Hardware wallet"
msgstr "Portfel sprzętowy"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr ""
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Centrum pomocy"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "Informacja o pomocy i wsparciu technicznym jest dostępna na stronie internetowej."
@@ -1347,17 +1409,17 @@ msgstr "Ukryj"
msgid "Hide Balance"
msgstr "Ukryj środki"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "Ukryj następne kroki karty"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "Ukryj opcje zaawansowane"
@@ -1387,9 +1449,9 @@ msgstr "Przeczytałem, zrozumiałem i wyrażam zgodę na get started with bitcoin."
msgstr "Przejmij kontrolę nad swoimi pieniędzmi,
zacznij korzystać z bitcoinów."
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "Dotknij i przytrzymaj, aby pokazać"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr ""
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "Ponów próbę"
@@ -2690,8 +2808,8 @@ msgstr "Warunki użytkowania"
msgid "Terms of Use"
msgstr "Warunki użytkowania"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
@@ -2754,7 +2872,7 @@ msgstr "Oficjalne Warunki użytkowania w języku angielskim dostępne są na str
msgid "The password of the recovery phrase (if set)"
msgstr "Hasło kluczowej frazy (jeśli ustawione)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "Wypłata została utworzona, ale nie może być zakończona. Spróbuj ponownie na stronie głównej"
@@ -2762,10 +2880,10 @@ msgstr "Wypłata została utworzona, ale nie może być zakończona. Spróbuj po
msgid "The payment was removed by creator"
msgstr "Wypłata została usunięta przez jej twórcę"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "Kluczowa fraza może wymagać hasła do zaimportowania"
@@ -2797,9 +2915,9 @@ msgstr "Adres URL usługi portfela"
msgid "There is a new version of {{appName}} available"
msgstr "Dostępna jest nowa wersja {{appName}}"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "Wystąpił błąd w postaci"
@@ -2816,13 +2934,13 @@ 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:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "Ten wniosek płatności wygasł."
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
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."
@@ -2838,13 +2956,13 @@ msgstr ""
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "Potwierdzenie transakcja może trwać długo lub zostać przerwane z powodu niskiej prowizji ustalonej przez nadawcę"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "Historia"
@@ -2873,7 +2991,7 @@ msgstr ""
msgid "Top up in progress..."
msgstr ""
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr ""
@@ -2884,11 +3002,11 @@ msgstr ""
msgid "Total"
msgstr "Łącznie"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "Łącznie zablokowane środki"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Liczba współwłaścicieli portfela"
@@ -2901,7 +3019,7 @@ msgstr ""
msgid "Touch ID Failed"
msgstr "Odczyt Touch ID nie powiódł się"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "Transakcja"
@@ -2918,9 +3036,9 @@ msgstr "Historia transakcji"
msgid "Transaction already broadcasted"
msgstr "Transakcja została już wysłana"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr ""
@@ -2928,7 +3046,7 @@ msgstr ""
msgid "Transaction initiated"
msgstr "Transakcja zainicjowana"
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "Transakcja w tej chwili niedostępna"
@@ -2941,7 +3059,7 @@ msgstr "Nie znaleziono transakcji"
msgid "Transactions without fee are not supported."
msgstr "Transakcje bez opłaty nie są obsługiwane."
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr "Przekaż do"
@@ -2965,15 +3083,11 @@ msgstr "Wpisz kluczową frazę (zwyczajowo 12 słów)"
msgid "Uh oh..."
msgstr "Ups..."
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "Niepotwierdzone"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "Jednostka"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "Niewysłane transakcje"
@@ -2993,7 +3107,7 @@ msgstr "Dostępna aktualizacja"
msgid "Updating pending proposals. Please stand by"
msgstr "Aktualizacja wniosków płatności. Proszę czekać"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "Aktualizowanie historii transakcji. Proszę czekać."
@@ -3005,7 +3119,7 @@ msgstr "Aktualizacja... Proszę czekać"
msgid "Urgent"
msgstr "Pilna"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "Użyj niepotwierdzonych środków"
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "Zobacz zasady użytkowania"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Zobacz transakcje na Insight"
@@ -3043,7 +3157,7 @@ msgstr "Zobacz transakcje na Insight"
msgid "View Update"
msgstr "Zobacz aktualizacje"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "Zobacz na blockchainie"
@@ -3051,7 +3165,7 @@ msgstr "Zobacz na blockchainie"
msgid "Visit mercadolivre.com.br →"
msgstr ""
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "Ostrzeżenie: klucz derywacji nie działa na tym urządzeniu/portfelu. Działania dla tego portfela nie można wykonać."
@@ -3092,7 +3206,7 @@ msgstr "Adresy portfela"
msgid "Wallet Color"
msgstr "Kolor portfela"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "Konfiguracja portfela (m-n)"
@@ -3100,7 +3214,7 @@ msgstr "Konfiguracja portfela (m-n)"
msgid "Wallet Created"
msgstr "Portfel został utworzony"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "Id Portfela"
@@ -3117,9 +3231,9 @@ msgstr ""
msgid "Wallet Invitation"
msgstr "Zaproszenie do portfela"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "Kluczowa fraza"
@@ -3131,13 +3245,13 @@ msgstr "Nazwa portfela"
msgid "Wallet Name (at creation)"
msgstr "Nazwa portfela (oryginalna)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "Sieć portfela"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "Kluczowa fraza portfela"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "Kluczowa fraza jest nieprawidłowa"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "Adres usług portfela"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "Ustawienia portfela"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "Rodzaj portfela"
@@ -3163,7 +3277,7 @@ msgstr "Rodzaj portfela"
msgid "Wallet already exists"
msgstr "Portfel już istnieje"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
msgstr ""
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "Portfel wymaga kopii zapasowej"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "Portfel nie ma kopii zapasowej"
@@ -3205,6 +3319,7 @@ 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
msgid "Wallet not registered"
msgstr "Portfel nie jest zarejestrowany"
@@ -3225,13 +3340,13 @@ msgstr "Nie znaleziono serwera"
msgid "Wallets"
msgstr "Portfele"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "Portfele i integracja"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3294,7 +3409,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:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "Nieprawidłowa ilość słów frazy:"
@@ -3404,19 +3519,24 @@ msgstr "Zakup został dodany do listy oczekujących"
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "Twój portfel nigdy nie jest przechowywany w chmurze lub na urządzeniach do tworzenia kopii zapasowych."
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[Balans ukryty]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr ""
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "dodaj swoje karty BitPay Visa"
@@ -3425,7 +3545,7 @@ msgstr "dodaj swoje karty BitPay Visa"
msgid "locked by pending payments"
msgstr "zablokowane przez oczekujące wypłaty"
-#: src/js/services/profileService.js:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "ja"
@@ -3437,25 +3557,11 @@ msgstr "nazwa@przyklad.com"
msgid "preparing..."
msgstr "Przygotowywanie..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "do akceptacji"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "do zapłaty"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "do wysłania"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} dla karty upominkowej Amazon.com"
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
msgstr ""
@@ -3463,7 +3569,7 @@ msgstr ""
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr "{{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:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} zostanie potrącone jako prowizja sieci bitcoin."
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} zostanie potrącone jako prowizja sieci bitcoin."
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr ""
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} transakcje pobrane"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-z-{{wallet.n}}"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index e2730a4eb..4e70bdfda 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-08-16 09:23-0400\n"
+"PO-Revision-Date: 2017-09-20 16:53-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -41,38 +41,38 @@ msgstr "Classificações de 5 estrelas ajudam-nos a que o {{appName}} chegue ás
#: www/views/mercadoLibre.html:18
#: www/views/mercadoLibre.html:40
msgid "Only redeemable on Mercado Livre (Brazil)"
-msgstr ""
+msgstr "Somente resgatável no Mercado Livre (Brasil)"
#: 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 "Um membro da equipa irá rever a sua avaliação assim que possível."
-#: src/js/controllers/confirm.js:351
+#: src/js/controllers/confirm.js:380
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:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "Sobre"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "Aceite"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "Conta"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "Número de conta"
@@ -106,9 +106,9 @@ msgstr "Adicionar fundos"
msgid "Add Memo"
msgstr "Adicionar nota"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "Adicionar uma senha"
@@ -116,17 +116,17 @@ msgstr "Adicionar uma senha"
msgid "Add account"
msgstr "Adicionar conta"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "Adicionar uma senha opcional para asegurar a frase de recuperação"
#: www/views/includes/incomingDataMenu.html:41
msgid "Add as a contact"
-msgstr "เพิ่มเป็นผู้ติดต่อ"
+msgstr "Adicionar como um contato"
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "Adicionar descrição"
@@ -153,7 +153,7 @@ msgstr "Endereço"
msgid "Address Book"
msgstr "Livros de endereços"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "Tipo de Endereço"
@@ -161,7 +161,7 @@ msgstr "Tipo de Endereço"
msgid "Addresses With Balance"
msgstr "Endereços com valores"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "Avançado"
@@ -198,13 +198,13 @@ msgid "Almost done! Let's review."
msgstr "Quase pronto! Vamos rever."
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "Moeda Alternativa"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
-msgstr "Amazon.com is not available at this moment. Please try back later."
+msgstr "Amazon.com não está disponível neste momento. Por favor, tente mais tarde."
#: www/views/amount.html:44
#: www/views/customAmount.html:34
@@ -216,7 +216,7 @@ msgstr "Valor"
msgid "Amount below minimum allowed"
msgstr "Montante abaixo do mínimo permitido"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "Montante muito grande"
@@ -256,11 +256,11 @@ msgstr "Tem certeza que deseja excluir este contato?"
msgid "Are you sure you want to delete this wallet?"
msgstr "Tem certeza que deseja excluir esta carteira?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "Tem certeza que deseja cancelar esta transação?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "Tem certeza que deseja remover esta transação?"
@@ -277,7 +277,7 @@ msgstr "Tem certeza que você deseja sair da sua conta do BitPay Card?"
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "Tem a certeza de que quer remover o seu Cartão BitPay ({{lastFourDigits}}) deste dispositivo?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "Audivel"
@@ -294,13 +294,17 @@ msgstr "Saldo Disponível"
msgid "Average confirmation time"
msgstr "Tempo de confirmação (em média)"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "Pacote BIP32 para endereço de derivação"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr "Carteiras BTC"
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "Backup"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "Faça backup de todas as carteiras do livenet antes de usar esta função"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Backup necessário"
@@ -331,11 +335,11 @@ 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:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "Convite para carteira inválido"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "Saldo por endereço"
@@ -352,15 +356,24 @@ msgstr "Cartões BitPay Visa®"
msgid "Bitcoin Address"
msgstr "Endereço Bitcoin"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr "Saldos Bitcoin Cash (BCH)"
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr "Suportar Bitcoin Cash"
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Política de taxa de rede Bitcoin"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Unidade do Bitcoin"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr "Pagamento Bitcoin Cash"
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -380,14 +393,14 @@ msgstr "As transações Bitcoin incluem uma taxa cobrada pelos mineiros na rede.
#: www/views/buyAmazon.html:108
msgid "Bought {{amountUnitStr}}"
-msgstr ""
+msgstr "Comprado {{amountUnitStr}}"
#: www/views/modals/txp-details.html:36
msgid "Broadcast Payment"
msgstr "Transmitir Pagamento"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "Transmitido"
@@ -402,7 +415,7 @@ msgstr "Navegador não suportado"
#: www/views/buyAmazon.html:5
#: www/views/buyMercadoLibre.html:6
msgid "Buy"
-msgstr ""
+msgstr "Comprar"
#: www/views/includes/buyAndSellCard.html:3
msgid "Buy & Sell Bitcoin"
@@ -415,11 +428,11 @@ msgstr "Comprar Bitcoin"
#: www/views/mercadoLibre.html:22
#: www/views/mercadoLibre.html:50
msgid "Buy a Gift Card"
-msgstr ""
+msgstr "Comprar um Vale-presente"
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
-msgstr ""
+msgstr "Comprar de"
#: src/js/services/onGoingProcess.js:40
msgid "Buying Bitcoin..."
@@ -429,10 +442,11 @@ msgstr "A comprar Bitcoin..."
msgid "Calculating fee"
msgstr "A calcular taxa"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr "Cancelar convite"
msgid "Cannot Create Wallet"
msgstr "Não é possível criar a carteira"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "Não pode juntar-se a mesma carteira mais que uma vez"
@@ -491,9 +505,19 @@ msgstr "Eliminar"
msgid "Clear cache"
msgstr "Limpar cache"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "Clique"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr "Clique para aceitar"
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr "Clique para pagar"
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr "Clique para enviar"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "Clique"
msgid "Close"
msgstr "Fechar"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr "Moeda"
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "Cor"
@@ -513,7 +542,7 @@ msgstr "Cor"
msgid "Commit hash"
msgstr "Commit de hash"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "Complete o processo de backup para usar esta opção"
@@ -521,11 +550,11 @@ msgstr "Complete o processo de backup para usar esta opção"
msgid "Completed"
msgstr "Concluído"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -541,17 +570,17 @@ msgstr "Confirmar & Terminado"
#: www/views/buyAmazon.html:90
#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
-msgstr ""
+msgstr "Confirmar compra"
#: www/views/modals/pin.html:10
msgid "Confirm your PIN"
msgstr "Confirme o seu PIN"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "Confirme a nova senha de pagamento"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "Confirmações"
@@ -604,7 +633,7 @@ msgstr "Informação do Copayer inválida"
msgid "Copayer joined"
msgstr "Copayer juntou-se"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Copayer {{$index}}"
@@ -626,27 +655,27 @@ msgstr "Copie este texto como está para um lugar seguro (bloco de notas ou e-ma
msgid "Copy to clipboard"
msgstr "Copiar para área de transferência"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
-msgstr ""
+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:"
msgstr "Não foi possível acessar a carteira no servidor. Por favor, verifique:"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
-msgstr ""
+msgstr "Não foi possível acessar a Amazon.com"
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "Impossível aceder à carteira"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Não foi possível adicionar mensagem à carteira importada sem chave de criptografia compartilhada"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "Não foi possível transmitir o pagamento"
@@ -654,55 +683,59 @@ msgstr "Não foi possível transmitir o pagamento"
msgid "Could not build transaction"
msgstr "Não foi possível criar a transacção"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "Não foi possível criar o endereço"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr "Não foi possível criar a fatura"
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr "Não foi possível criar a transação"
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
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:353
+#: src/js/services/profileService.js:363
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:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Não foi possível criar: Frase de recuperação de carteira inválida"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "Não foi possível descriptografar o arquivo, verifique sua senha"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "Não foi possível excluir a proposta de pagamento"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr "Não foi possível duplicar"
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "Não foi possível obter taxa dinâmica"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "Não foi possível obter a taxa dinâmica para nível: {{feeLevel}}"
#: src/js/controllers/modals/feeLevels.js:112
msgid "Could not get fee levels"
-msgstr ""
+msgstr "Não foi possível obter níveis de taxa"
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr "Não foi possível obter a fatura"
@@ -710,21 +743,21 @@ 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:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "Não foi possível importar"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
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:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "Impossível juntar à carteira"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "Não foi possível rejeitar o pagamento"
@@ -741,22 +774,22 @@ msgstr "Não foi possível remover o cartão"
msgid "Could not save preferences on the server"
msgstr "Não foi possível guardar as suas preferências no servidor"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "Não foi possível enviar o pagamento"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr "Não foi possível enviar a transação"
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "Não foi possível atualizar o histórico de transações"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "Criar carteira partilhada"
msgid "Create bitcoin wallet"
msgstr "Criar carteira bitcoin"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "Criando nova carteira"
@@ -784,7 +817,7 @@ msgstr "Criando nova carteira"
msgid "Create shared wallet"
msgstr "Criar carteira partilhada"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Criar carteira de {{formData.requiredCopayers}}-de-{{formData.totalCopayers}}"
@@ -808,15 +841,15 @@ msgstr "Taxa atual para esta política"
#: src/js/services/feeService.js:15
msgid "Custom"
-msgstr ""
+msgstr "Personalizado"
#: www/views/customAmount.html:9
msgid "Custom Amount"
msgstr "Montante personalizado"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
-msgstr ""
+msgstr "Taxa personalizada"
#: www/views/modals/mercadolibre-card-details.html:56
#: www/views/modals/txp-details.html:89
@@ -849,14 +882,14 @@ msgstr "A eliminar carteira..."
msgid "Deleting payment proposal"
msgstr "A eliminar proposta de pagamento"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "Caminho de derivação"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "Estratégia de derivação"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr "Detalhes"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Desativado"
@@ -890,6 +924,14 @@ 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
+msgid "Duplicate for BCH"
+msgstr "Duplicado para BCH"
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+msgstr "Duplicando carteira..."
+
#: www/views/addresses.html:19
msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment."
msgstr "Cada carteira de Bitcoin pode gerar biliões de endereços através do seu backup de 12-palavras. Um novo endereço é gerado automáticamente e mostrado cada vez que receber um pagamento."
@@ -915,6 +957,10 @@ msgstr "Endereço de email"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "Limite de endereços vazios atingido. Novos endereço não podem ser gerados."
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr "Permitir a criação e operação de carteira Bitcoin Cash dentro do aplicativo."
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "Permita o acesso de câmera nas configurações do seu dispositivo para começar."
@@ -931,8 +977,12 @@ msgstr "Ativar notificações push"
msgid "Enable the camera to get started."
msgstr "Ative a câmera para começar."
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "Inserir senha de compra"
@@ -942,19 +992,19 @@ msgstr "Insira verificação dois passos para sua conta BitPay"
#: www/views/amount.html:4
msgid "Enter amount"
-msgstr ""
+msgstr "Digite a quantidade"
#: www/views/modals/chooseFeeLevel.html:41
msgid "Enter custom fee"
-msgstr ""
+msgstr "Digite a taxa personalizada"
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "Insira a nova senha para pagamento"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "Digite a frase de recuperação (BIP39)"
@@ -970,23 +1020,24 @@ msgstr "Digite sua senha"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "Digite sua senha"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "Erro"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "Erro na confirmação"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
-msgstr ""
+msgstr "Erro ao criar vale-presente"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
-msgstr ""
+msgstr "Erro ao criar a fatura"
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "Erro na criação da carteira"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr "Erro ao obter informações de SendMax"
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr "Erro no Protocolo de Pagamento"
@@ -1076,7 +1130,7 @@ msgstr "Erro de emparelhamento na Conta BitPay"
msgid "Error scanning funds:"
msgstr "Erro na varredura dos fundos:"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "Erro na varredura da carteira:"
@@ -1088,7 +1142,7 @@ msgstr "Erro na atualização dos Cartões de Débito"
msgid "Exceeded daily limit of $500 per user"
msgstr "Excedido limite diário de $500 por usuário"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,18 +1168,18 @@ msgstr "Exportar para arquivo"
msgid "Export wallet"
msgstr "Exportar carteira"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "Exportação via QR code não suportada por essa carteira"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "Chave Pública Estendida"
#: src/js/services/onGoingProcess.js:20
msgid "Extracting Wallet information..."
-msgstr ""
+msgstr "Extraindo informações da Carteira..."
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -1146,11 +1200,11 @@ msgstr "Taxa"
#: www/views/modals/chooseFeeLevel.html:75
msgid "Fee level"
-msgstr ""
+msgstr "Nível de taxa"
#: src/js/controllers/modals/feeLevels.js:100
msgid "Fee level is not defined"
-msgstr ""
+msgstr "Nível de taxa não está definido"
#: www/views/confirm.html:81
#: www/views/modals/txp-details.html:101
@@ -1167,7 +1221,7 @@ msgstr "Buscando Conta BitPay..."
#: src/js/services/onGoingProcess.js:21
msgid "Fetching payment information"
-msgstr ""
+msgstr "Buscando informação de pagamento"
#: www/views/export.html:14
#: www/views/import.html:16
@@ -1176,7 +1230,7 @@ msgstr "Arquivo/Texto"
#: www/views/preferencesLogs.html:17
msgid "Filter setting"
-msgstr ""
+msgstr "Configuração de filtro"
#: src/js/services/fingerprintService.js:43
#: src/js/services/fingerprintService.js:48
@@ -1188,12 +1242,12 @@ msgstr "Leitura de Impressão Digital falhou"
msgid "Finish"
msgstr "Encerrar"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "Para fins de auditoria"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "De"
msgid "From BitPay account"
msgstr "De conta BitPay"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr "De uma Carteira de Hardware"
@@ -1262,7 +1316,7 @@ msgstr "Receba notícias e atualizações da BitPay"
#: www/views/onboarding/welcome.html:8
msgctxt "button"
msgid "Get started"
-msgstr ""
+msgstr "Começar"
#: www/views/bitpayCard.html:49
msgid "Get started"
@@ -1279,29 +1333,32 @@ msgstr "Obtendo níveis de taxa..."
#: 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 ""
+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 ""
+msgstr "Vale-presente"
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
-msgstr ""
+msgstr "Vale-presente expirado"
#: www/views/buyAmazon.html:111
msgid "Gift card generated and ready to use."
-msgstr ""
+msgstr "Vale-presente gerado e pronto para uso."
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: 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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Retroceder"
@@ -1317,8 +1374,8 @@ msgstr "Retroceder"
msgid "Got it"
msgstr "Compreendi"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "Carteira de hardware"
@@ -1330,12 +1387,17 @@ msgstr "Hardware não conectado."
msgid "Hardware wallet"
msgstr "Carteira de hardware"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr "Carteiras de hardware ainda não são suportadas com Bitcoin Cash"
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Ajuda e suporte"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "Informações de Ajuda e Suporte estão disponíveis no site."
@@ -1347,17 +1409,17 @@ msgstr "Esconder"
msgid "Hide Balance"
msgstr "Esconder saldos"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "Esconder próximo passo do cartão"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "Ocultar opções avançadas"
@@ -1387,9 +1449,9 @@ msgstr "Li, entendi e concordo com os get started with bitcoin."
msgstr "Assuma o controle de seu dinheiro,
começar com bitcoin."
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "Toque e mantenha para mostrar"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr "Toque para recriar"
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "Bata para repetir"
@@ -2690,14 +2808,14 @@ msgstr "Termos de uso"
msgid "Terms of Use"
msgstr "Termos de uso"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
#: www/views/includes/incomingDataMenu.html:61
msgid "Text"
-msgstr ""
+msgstr "Texto"
#: src/js/controllers/feedback/send.js:27
#: src/js/controllers/feedback/send.js:76
@@ -2754,7 +2872,7 @@ msgstr "Os Termos de Serviço oficiais estão disponíveis no site BitPay."
msgid "The password of the recovery phrase (if set)"
msgstr "A senha da frase de recuperação (se configurada)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "O pagamento foi criado mas não pode ser completado. Por favor, tente novamente a partir da tela inicial."
@@ -2762,10 +2880,10 @@ msgstr "O pagamento foi criado mas não pode ser completado. Por favor, tente no
msgid "The payment was removed by creator"
msgstr "O pagamento foi removido pelo criador"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "A frase de recuperação pode exigir que uma senha seja importada"
@@ -2797,9 +2915,9 @@ msgstr "O URL do serviço carteira"
msgid "There is a new version of {{appName}} available"
msgstr "Existe uma nova versão do {{appName}} disponível"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "Existe um erro no formulário"
@@ -2816,13 +2934,13 @@ 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:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "Este bitcoin pagamento pedido expirou."
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
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."
@@ -2838,13 +2956,13 @@ msgstr "Este valor de transação é muito pequeno em comparação com as taxas
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"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "Cronograma"
@@ -2873,7 +2991,7 @@ msgstr "Para {{reason}} você deve primeiro adicionar sua conta BitPay - {{email
msgid "Top up in progress..."
msgstr "Recarga em andamento..."
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr "Recarga de {{amountStr}} para cartão de débito ({{cardLastNumber}})"
@@ -2884,11 +3002,11 @@ msgstr "Recarga de {{amountStr}} para cartão de débito ({{cardLastNumber}})"
msgid "Total"
msgstr "Total"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "Saldo Total Bloqueado"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Número total de copayers"
@@ -2901,13 +3019,13 @@ msgstr "Total de entradas da carteira"
msgid "Touch ID Failed"
msgstr "Falha no Touch ID"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "Transação"
#: www/views/confirm.html:128
msgid "Transaction Created"
-msgstr ""
+msgstr "Transação Criada"
#: www/views/preferencesAdvanced.html:29
#: www/views/preferencesHistory.html:3
@@ -2918,9 +3036,9 @@ msgstr "Histórico de Transações"
msgid "Transaction already broadcasted"
msgstr "Transação foi publicada"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr "Transação não foi criada"
@@ -2928,7 +3046,7 @@ msgstr "Transação não foi criada"
msgid "Transaction initiated"
msgstr "Transação iniciada"
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "Transação não está disponível neste momento"
@@ -2939,9 +3057,9 @@ msgstr "Transação não encontrada"
#: www/views/modals/chooseFeeLevel.html:55
msgid "Transactions without fee are not supported."
-msgstr ""
+msgstr "Transações sem taxa não são suportadas."
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr "Transferir para"
@@ -2965,15 +3083,11 @@ msgstr "Digite a frase de recuperação (normalmente 12 palavras)"
msgid "Uh oh..."
msgstr "Uh oh..."
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "Não confirmado"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "Unidade"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "Transações não enviadas"
@@ -2993,7 +3107,7 @@ msgstr "Atualização Disponível"
msgid "Updating pending proposals. Please stand by"
msgstr "Atualizando propostas pendentes. Por favor, aguarde"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "Atualizando o histórico de transações. Por favor, aguarde."
@@ -3005,7 +3119,7 @@ msgstr "Atualizando... Por favor, aguarde"
msgid "Urgent"
msgstr "Urgente"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "Utilizar fundos não confirmados"
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "Ver os Termos de Serviço"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Exibir Transação no Insight"
@@ -3043,15 +3157,15 @@ msgstr "Exibir Transação no Insight"
msgid "View Update"
msgstr "Ver atualizações"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "Ver no blockchain"
#: www/views/mercadoLibre.html:26
msgid "Visit mercadolivre.com.br →"
-msgstr ""
+msgstr "Visite mercadolivre.com.br →"
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "Aviso: Derivação de chave não está funcionando neste dispositivo/carteira. Ações não podem ser executadas nesta carteira."
@@ -3092,7 +3206,7 @@ msgstr "Endereços da carteira"
msgid "Wallet Color"
msgstr "Cor da carteira"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "Configuração da carteira (m-n)"
@@ -3100,7 +3214,7 @@ msgstr "Configuração da carteira (m-n)"
msgid "Wallet Created"
msgstr "Carteira criada"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "Id da carteira"
@@ -3117,9 +3231,9 @@ msgstr "Entradas da carteira"
msgid "Wallet Invitation"
msgstr "Convite para Carteira"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "Chave da carteira"
@@ -3131,13 +3245,13 @@ msgstr "Nome da carteira"
msgid "Wallet Name (at creation)"
msgstr "Nome da carteira (na criação)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "Network da carteira"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "Frase de recuperação da carteira"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "Frase de recuperação da carteira é inválida"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "URL do serviço de carteira"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "Configurações da carteira"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "Tipo da carteira"
@@ -3163,9 +3277,9 @@ msgstr "Tipo da carteira"
msgid "Wallet already exists"
msgstr "A carteira já existe"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
-msgstr ""
+msgstr "Carteira já existente no {{appName}}"
#: www/views/includes/walletActivity.html:6
msgid "Wallet created"
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "Carteira precisa de backup"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "Carteira sem backup"
@@ -3205,6 +3319,7 @@ 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
msgid "Wallet not registered"
msgstr "Carteira não registrada"
@@ -3225,13 +3340,13 @@ msgstr "Serviço de carteira não encontrado"
msgid "Wallets"
msgstr "Carteiras"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "Carteiras & Integrações"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3264,7 +3379,7 @@ msgstr "Estamos sempre procurando maneiras de melhorar o {{appName}}. Como melho
#: www/views/includes/incomingDataMenu.html:6
msgid "Website"
-msgstr ""
+msgstr "Página da Web"
#: www/views/preferencesLanguage.html:16
msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin."
@@ -3294,7 +3409,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:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "Número errado de palavras de recuperação:"
@@ -3344,7 +3459,7 @@ msgstr "Você controla o seu bitcoin."
#: www/views/modals/chooseFeeLevel.html:64
msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte."
-msgstr ""
+msgstr "Você não deve definir uma taxa maior do que {{maxFeeRecommended}} satoshis/byte."
#: www/views/modals/bitpay-card-confirmation.html:5
msgid "You will need to log back for fill in your BitPay Card."
@@ -3361,7 +3476,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 ""
+msgstr "Seus Vales-presente"
#: www/views/includes/confirmBackupPopup.html:6
msgid "Your bitcoin wallet is backed up!"
@@ -3373,7 +3488,7 @@ msgstr "Sua carteira de bitcoins está pronta!"
#: www/views/modals/chooseFeeLevel.html:61
msgid "Your fee is lower than recommended."
-msgstr ""
+msgstr "Sua taxa é mais baixa do que a recomendada."
#: www/views/feedback/send.html:42
msgid "Your ideas, feedback, or comments"
@@ -3394,29 +3509,34 @@ msgstr "Sua senha"
#: www/views/buyAmazon.html:102
msgid "Your purchase could not be completed"
-msgstr ""
+msgstr "Sua compra não pôde ser concluída"
#: www/views/buyAmazon.html:105
msgid "Your purchase was added to the list of pending"
-msgstr ""
+msgstr "Sua compra foi adicionada à lista de pendências"
#: www/views/onboarding/backupRequest.html:10
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "Sua carteira nunca foi salva num armazenamento em nuvem ou dispositivo padrão de backups."
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[Valores escondidos]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr "[Pesquisando fundos]"
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "Adicionar seu(s) cartão(ões) BitPay Visa"
@@ -3425,7 +3545,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:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "eu"
@@ -3437,33 +3557,19 @@ msgstr "nome@exemplo.pt"
msgid "preparing..."
msgstr "a preparar..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "a aceitar"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "a pagar"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "a enviar"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
-msgstr ""
+msgstr "{{amountStr}} em Vale-presente da Amazon.com"
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
-msgstr ""
+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:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} será deduzido para taxas de rede bitcoins."
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} será deduzido para taxas de rede bitcoins."
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "{{tx.txp[wallet.id].feeRatePerStr}} da quantidade de envio"
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "Transações de {{updatingTxHistoryProgress}} transferidas"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-de-{{wallet.n}}"
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 3c45e49e5..e1c5b3f7e 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-08-16 09:23-0400\n"
+"PO-Revision-Date: 2017-09-20 16:53-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -48,31 +48,31 @@ msgstr ""
msgid "A member of the team will review your feedback as soon as possible."
msgstr "Участник команды рассмотрит ваш отзыв при первой возможности."
-#: src/js/controllers/confirm.js:351
+#: src/js/controllers/confirm.js:380
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "Всего {{amountAboveMaxSizeStr}} было исключено. Превышен максимальный размер, разрешенный для транзакции."
-#: src/js/controllers/confirm.js:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "О проекте"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "Принято"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "Учётная запись"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "Номер учётной записи"
@@ -106,9 +106,9 @@ msgstr "Пополнить счёт"
msgid "Add Memo"
msgstr "Добавить памятку"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "Защитить паролем"
@@ -116,17 +116,17 @@ msgstr "Защитить паролем"
msgid "Add account"
msgstr "gfhcdtgfdth"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "Добавьте необязательный пароль для защиты ключевого словосочетания"
#: www/views/includes/incomingDataMenu.html:41
msgid "Add as a contact"
-msgstr ""
+msgstr "Добавить контакт"
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "Добавить описание"
@@ -153,7 +153,7 @@ msgstr "Адрес"
msgid "Address Book"
msgstr "Aдресная книга"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "Тип адреса"
@@ -161,7 +161,7 @@ msgstr "Тип адреса"
msgid "Addresses With Balance"
msgstr "Адреса с балансом"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "Дополнительные возможности"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "Почти готово! Давайте проверим."
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "Альтернативная валюта"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr ""
@@ -216,7 +216,7 @@ msgstr "Сумма"
msgid "Amount below minimum allowed"
msgstr "Сумма ниже допустимого минимума"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "Слишком большая сумма"
@@ -256,11 +256,11 @@ msgstr "Вы действительно хотите удалить этот к
msgid "Are you sure you want to delete this wallet?"
msgstr "Вы точно хотите удалить этот кошелёк?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "Вы точно хотите отклонить этот платёж?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "Вы точно хотите удалить эту транзакцию?"
@@ -277,7 +277,7 @@ msgstr ""
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "Вы уверены, что вы хотели бы удалить карточку BitPay Card ({{lastFourDigits}}) из этого устройства?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "Проверяемый"
@@ -294,13 +294,17 @@ msgstr "Доступный баланс"
msgid "Average confirmation time"
msgstr "Среднее время подтверждения"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "Укажите BIP32 для генерации адресов"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr ""
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "Резервное копирование"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "Сделайте резервную копию всех livenet кошельков перед использованием этой функции"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "Требуется резервное копирование"
@@ -331,11 +335,11 @@ msgstr "Резервное копирование"
msgid "Backup your wallet before using this function"
msgstr "Сделайте резервную копию вашего кошелька перед использованием этой функции"
-#: src/js/services/profileService.js:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "Недействительное приглашение"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "Баланс на адресах"
@@ -352,15 +356,24 @@ msgstr "BitPay Visa® картыllllll"
msgid "Bitcoin Address"
msgstr "Биткойн-адрес"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr ""
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "Политика комиссии сети Биткойн"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "Единица измерения"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr ""
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -386,8 +399,8 @@ msgstr ""
msgid "Broadcast Payment"
msgstr "Отправить платёж"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "Отправка"
@@ -415,11 +428,11 @@ msgstr "Купить биткойн"
#: www/views/mercadoLibre.html:22
#: www/views/mercadoLibre.html:50
msgid "Buy a Gift Card"
-msgstr ""
+msgstr "Купить подарочную карту"
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
-msgstr ""
+msgstr "Купить"
#: src/js/services/onGoingProcess.js:40
msgid "Buying Bitcoin..."
@@ -429,10 +442,11 @@ msgstr "Покупка биткойн..."
msgid "Calculating fee"
msgstr "Вычисление комиссии"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr "Отменить приглашение?"
msgid "Cannot Create Wallet"
msgstr "Не удаётся создать кошелёк"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "Нельзя присоединиться к одному и тому же кошельку более одного раза"
@@ -491,9 +505,19 @@ msgstr "Очистить"
msgid "Clear cache"
msgstr "Очистить кэш"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "Click"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr "Подтвердить"
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr "Оплатить"
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr "Отправить"
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "Click"
msgid "Close"
msgstr "Закрыть"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr ""
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "Цвет"
@@ -513,7 +542,7 @@ msgstr "Цвет"
msgid "Commit hash"
msgstr "Хэш версии"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "Завершите процесс резервного копирования для использования этой опции"
@@ -521,11 +550,11 @@ msgstr "Завершите процесс резервного копирова
msgid "Completed"
msgstr "Завершено"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -541,17 +570,17 @@ msgstr "Подтвердить & Завершить"
#: www/views/buyAmazon.html:90
#: www/views/buyMercadoLibre.html:77
msgid "Confirm purchase"
-msgstr ""
+msgstr "Подтвердить покупку"
#: www/views/modals/pin.html:10
msgid "Confirm your PIN"
msgstr "Подтвердите Ваш PIN-код"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "Подтвердите ваш новый платёжный пароль"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "Подтверждения"
@@ -604,7 +633,7 @@ msgstr "Несоответствие данных совладельца кош
msgid "Copayer joined"
msgstr "Совладелец присоединился"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Совладелец {{$index}}"
@@ -626,7 +655,7 @@ msgstr "Скопируйте этот текст как есть (в блокн
msgid "Copy to clipboard"
msgstr "Скопировать в буфер обмена"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
msgstr ""
@@ -634,19 +663,19 @@ msgstr ""
msgid "Could not access the wallet at the server. Please check:"
msgstr "Не удалось получить доступ к кошельку на сервере. Проверьте, пожалуйста:"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr ""
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "Не удалось получить доступ к кошельку"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "Не удалось добавить сообщение в импортированный кошелёк без общего ключа шифрования"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "Не удалось отправить платёж"
@@ -654,45 +683,49 @@ msgstr "Не удалось отправить платёж"
msgid "Could not build transaction"
msgstr "Не удалось создать транзакцию"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "Не удалось создать адрес"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr ""
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr ""
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
msgid "Could not create using the specified extended private key"
msgstr "Не удалось создать используя указанный расширенный закрытый ключ"
-#: src/js/services/profileService.js:353
+#: src/js/services/profileService.js:363
msgid "Could not create using the specified extended public key"
msgstr "Не удалось создать используя указанный расширенный открытый ключ"
-#: src/js/services/profileService.js:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "Не удалось создать: недействительное ключевое словосочетание"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "Не удалось расшифровать файл, проверьте пароль"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "Не удалось удалить предложенный платёж"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr ""
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "Не удалось получить динамическую комиссию"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "Не удалось получить динамическую комиссию для уровня: {{feeLevel}}"
@@ -700,9 +733,9 @@ msgstr "Не удалось получить динамическую комис
msgid "Could not get fee levels"
msgstr ""
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr ""
@@ -710,21 +743,21 @@ msgstr ""
msgid "Could not get transactions"
msgstr "Не удалось получить транзакции"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "Не удалось импортировать"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
msgid "Could not import. Check input file and spending password"
msgstr "Не удалось импортировать. Проверьте импортируемый файл и платёжный пароль"
-#: src/js/services/profileService.js:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "Не удалось присоединиться к кошельку"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "Не удалось отклонить платёж"
@@ -741,22 +774,22 @@ msgstr "Не удалось удалить карту"
msgid "Could not save preferences on the server"
msgstr "Не удалось сохранить параметры на сервере"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "Не удалось отправить платёж"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr ""
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "Не удалось обновить журнал транзакций"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "Создать общий кошелёк"
msgid "Create bitcoin wallet"
msgstr "Создать биткойн-кошелёк"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "Создать новый кошелёк"
@@ -784,7 +817,7 @@ msgstr "Создать новый кошелёк"
msgid "Create shared wallet"
msgstr "Создать общий кошелёк"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "Создать кошелёк {{formData.requiredCopayers}}-из-{{formData.totalCopayers}}"
@@ -814,7 +847,7 @@ msgstr ""
msgid "Custom Amount"
msgstr "Сумма"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr ""
@@ -849,14 +882,14 @@ msgstr "Удаление кошелька..."
msgid "Deleting payment proposal"
msgstr "Удаление предложенного платежа"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "Путь деривации"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "Стратегия деривации"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr "Подробности"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "Отключено"
@@ -890,6 +924,14 @@ msgstr "Не видите свой язык на Crowdin? Свяжитесь с
msgid "Download"
msgstr "Скачать"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr ""
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+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."
msgstr "Любой биткойн-кошелёк может создать миллиарды адресов из вашей ключевой фразы. Новый адрес автоматически генерируется каждый раз, когда вы получаете платеж."
@@ -900,7 +942,7 @@ msgstr "Экономичная"
#: www/views/onboarding/collectEmail.html:27
msgid "Edit"
-msgstr ""
+msgstr "Редактировать"
#: www/views/addressbook.add.html:29
#: www/views/addressbook.view.html:22
@@ -915,6 +957,10 @@ msgstr "Email"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "Достигнут предел пустых адресов. Новые адреса больше не могут быть сгенерированы."
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr ""
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "Чтобы начать, разрешите доступ к камере в настройках вашего устройства."
@@ -931,8 +977,12 @@ msgstr "Включить push-уведомления"
msgid "Enable the camera to get started."
msgstr "Чтобы начать, включите камеру."
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr "Активировать"
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "Введите платёжный пароль"
@@ -942,25 +992,25 @@ msgstr "Введите второй фактор вашей учётной за
#: www/views/amount.html:4
msgid "Enter amount"
-msgstr ""
+msgstr "Введите сумму"
#: www/views/modals/chooseFeeLevel.html:41
msgid "Enter custom fee"
msgstr ""
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "Введите новый платёжный пароль"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "Введите ключевое словосочетание (BIP39)"
#: www/views/onboarding/collectEmail.html:13
msgid "Enter your email"
-msgstr ""
+msgstr "Введите Ваш email"
#: www/views/backup.html:62
msgid "Enter your password"
@@ -970,23 +1020,24 @@ msgstr "Введите пароль"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "Введите пароль"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "Ошибка"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "Ошибка при подтверждении"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
-msgstr ""
+msgstr "Ошибка создания Подарочной карты"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr ""
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "Ошибка создания кошелька"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr ""
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr ""
@@ -1076,7 +1130,7 @@ msgstr ""
msgid "Error scanning funds:"
msgstr "Ошибка сканирования кошелька:"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "Ошибка считывания кошелька:"
@@ -1088,7 +1142,7 @@ msgstr "Ошибка обновления Дебетовых Карт"
msgid "Exceeded daily limit of $500 per user"
msgstr "Превышен дневной лимит в 500$ на пользователя"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,12 +1168,12 @@ msgstr "Экспорт в файл"
msgid "Export wallet"
msgstr "Экспорт кошелька"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "Экспорт QR-кодом не поддерживается для этого кошелька"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "Расширенные открытые ключи"
@@ -1176,7 +1230,7 @@ msgstr "Файл/текст"
#: www/views/preferencesLogs.html:17
msgid "Filter setting"
-msgstr ""
+msgstr "Настройка фильтров"
#: src/js/services/fingerprintService.js:43
#: src/js/services/fingerprintService.js:48
@@ -1188,12 +1242,12 @@ msgstr "Не удалось сканировать отпечаток пальц
msgid "Finish"
msgstr "Готово"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "Для целей ревизии"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "От"
msgid "From BitPay account"
msgstr "С аккаунта BitPay"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr ""
@@ -1241,7 +1295,7 @@ msgstr "Средства будут переведены на"
#: www/views/tab-receive.html:51
msgid "Generate new address"
-msgstr ""
+msgstr "Сгенерировать новый адрес"
#: src/js/services/onGoingProcess.js:22
msgid "Generating .csv file..."
@@ -1262,7 +1316,7 @@ msgstr "Получать письма с новостями от BitPay"
#: www/views/onboarding/welcome.html:8
msgctxt "button"
msgid "Get started"
-msgstr ""
+msgstr "Начать"
#: www/views/bitpayCard.html:49
msgid "Get started"
@@ -1286,7 +1340,7 @@ msgstr ""
msgid "Gift card"
msgstr "Подарочная карта"
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr ""
@@ -1297,11 +1351,14 @@ msgstr ""
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: 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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "Вернуться"
@@ -1317,8 +1374,8 @@ msgstr "Вернуться"
msgid "Got it"
msgstr "Понял"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "Аппаратный кошелёк"
@@ -1330,12 +1387,17 @@ msgstr "Аппаратное обеспечение не подключено."
msgid "Hardware wallet"
msgstr "Аппаратный кошелёк"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr ""
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "Помощь и поддержка"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "Информация о помощи и поддержке доступна на сайте."
@@ -1347,17 +1409,17 @@ msgstr "Спрятать"
msgid "Hide Balance"
msgstr "Скрыть баланс"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "Пропустить следующие шаги"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "Скрыть дополнительные параметры"
@@ -1387,9 +1449,9 @@ msgstr "Я прочитал, понял, и соглашаюсь с get started with bitcoin."
msgstr "Возьмите ваши финансы под контроль,
начните пользоваться Биткойн."
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "Коснитесь и удерживайте, чтобы показать"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr ""
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "Повторить"
@@ -2690,14 +2808,14 @@ msgstr "Условия использования"
msgid "Terms of Use"
msgstr "Условия использования"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
#: www/views/includes/incomingDataMenu.html:61
msgid "Text"
-msgstr ""
+msgstr "Текст"
#: src/js/controllers/feedback/send.js:27
#: src/js/controllers/feedback/send.js:76
@@ -2754,7 +2872,7 @@ msgstr "Официальные Условия обслуживания на ан
msgid "The password of the recovery phrase (if set)"
msgstr "Пароль ключевого словосочетания (если установлен)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "Платёж был создан, но не может быть завершен. Пожалуйста, вернитесь на вкладку Обзор и попробуйте снова"
@@ -2762,10 +2880,10 @@ msgstr "Платёж был создан, но не может быть заве
msgid "The payment was removed by creator"
msgstr "Платёж был удалён его создателем"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "Для импортирования ключевого словосочетания может потребоваться пароль"
@@ -2797,9 +2915,9 @@ msgstr "Адрес сервера Bitcore"
msgid "There is a new version of {{appName}} available"
msgstr "Доступна новая версия {{appName}}"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "Ошибка в форме"
@@ -2816,13 +2934,13 @@ msgstr "Замечательное приложение!"
msgid "This app stores your bitcoin with cutting-edge security."
msgstr ""
-#: src/js/controllers/confirm.js:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "Этот запрос платежа истёк."
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr ""
@@ -2838,13 +2956,13 @@ msgstr ""
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr ""
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "Хронология"
@@ -2873,7 +2991,7 @@ msgstr ""
msgid "Top up in progress..."
msgstr ""
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr ""
@@ -2884,11 +3002,11 @@ msgstr ""
msgid "Total"
msgstr "Баланс кошелька"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "Всего заблокировано средств"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Количество совладельцев"
@@ -2901,7 +3019,7 @@ msgstr ""
msgid "Touch ID Failed"
msgstr "Ошибка Touch ID"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "Транзакция"
@@ -2918,9 +3036,9 @@ msgstr "История транзакций"
msgid "Transaction already broadcasted"
msgstr "Транзакция уже отправлена"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr ""
@@ -2928,7 +3046,7 @@ msgstr ""
msgid "Transaction initiated"
msgstr ""
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "Транзакция недоступна в данный момент"
@@ -2941,9 +3059,9 @@ msgstr "Транзакция не обнаружена"
msgid "Transactions without fee are not supported."
msgstr ""
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
-msgstr ""
+msgstr "Перевести в"
#: www/views/tab-send.html:67
msgid "Transfer to Wallet"
@@ -2965,15 +3083,11 @@ msgstr "Введите ключевое словосочетание (обычн
msgid "Uh oh..."
msgstr "Упс..."
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "Неподтверждено"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "Единица измерения"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "Неотправленные транзакции"
@@ -2993,7 +3107,7 @@ msgstr "Доступно обновление"
msgid "Updating pending proposals. Please stand by"
msgstr "Обновление ожидающих рассмотрения платежей. Подождите, пожалуйста"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "Обновление истории транзакций. Подождите, пожалуйста."
@@ -3005,7 +3119,7 @@ msgstr "Обновление... Подождите, пожалуйста"
msgid "Urgent"
msgstr "Срочно"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "Использовать неподтверждённые средства"
@@ -3015,7 +3129,7 @@ msgstr "Проверка ключевого словосочетания..."
#: www/views/modals/fingerprintCheck.html:4
msgid "Verify your identity"
-msgstr ""
+msgstr "Подтвердить личность"
#: www/views/preferencesAbout.html:14
#: www/views/preferencesExternal.html:25
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "Посмотреть Условия обслуживания"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "Просмотреть транзакцию на Insight"
@@ -3043,7 +3157,7 @@ msgstr "Просмотреть транзакцию на Insight"
msgid "View Update"
msgstr "Просмотреть обновление"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "Посмотреть в блокчейне"
@@ -3051,7 +3165,7 @@ msgstr "Посмотреть в блокчейне"
msgid "Visit mercadolivre.com.br →"
msgstr ""
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "ВНИМАНИЕ: Деривация ключей не работает на этом устройстве/кошельке. Никакие действия не могут быть произведены с этим кошельком."
@@ -3092,7 +3206,7 @@ msgstr "Адреса кошелька"
msgid "Wallet Color"
msgstr "Цвет кошелька"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "Конфигурация кошелька (m-n)"
@@ -3100,7 +3214,7 @@ msgstr "Конфигурация кошелька (m-n)"
msgid "Wallet Created"
msgstr "Кошелёк создан"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "Идентификатор кошелька"
@@ -3117,9 +3231,9 @@ msgstr ""
msgid "Wallet Invitation"
msgstr "Приглашение присоединиться к кошельку"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "Ключевое словосочетание"
@@ -3131,13 +3245,13 @@ msgstr "Название кошелька"
msgid "Wallet Name (at creation)"
msgstr "Название кошелька (при создании)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "Сеть кошелька"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "Ключевое словосочетание кошелька"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "Ключевое словосочетание кошелька недействительно"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "Адрес сервера Bitcore"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "Параметры кошелька"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "Тип кошелька"
@@ -3163,7 +3277,7 @@ msgstr "Тип кошелька"
msgid "Wallet already exists"
msgstr "Кошелёк уже существует"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
msgstr ""
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "Необходимо создать резервную копию"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "Резервное копирование не выполнено"
@@ -3205,6 +3319,7 @@ msgstr "Резервное копирование не выполнено"
msgid "Wallet not found"
msgstr "Кошелёк не найден"
+#: src/js/controllers/cashScan.js:65
#: src/js/controllers/tab-home.js:220
msgid "Wallet not registered"
msgstr "Кошелёк не зарегистрирован"
@@ -3225,13 +3340,13 @@ msgstr "Сервер Bitcore не найден"
msgid "Wallets"
msgstr "Кошельки"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "Кошельки и интеграция"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3264,7 +3379,7 @@ msgstr ""
#: www/views/includes/incomingDataMenu.html:6
msgid "Website"
-msgstr ""
+msgstr "Сайт"
#: www/views/preferencesLanguage.html:16
msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin."
@@ -3294,7 +3409,7 @@ msgstr ""
msgid "Would you like to receive push notifications about payments?"
msgstr "Вы хотели бы получать push-уведомления о платежах?"
-#: src/js/controllers/import.js:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "Неподходящее количество слов в ключевом словосочетании:"
@@ -3361,7 +3476,7 @@ msgstr ""
#: www/views/mercadoLibre.html:57
#: www/views/mercadoLibreCards.html:6
msgid "Your Gift Cards"
-msgstr ""
+msgstr "Мои подарочные карты"
#: www/views/includes/confirmBackupPopup.html:6
msgid "Your bitcoin wallet is backed up!"
@@ -3404,19 +3519,24 @@ msgstr ""
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "Ваш кошелёк никогда не сохраняется в облачное хранилище или в резервные копии устройства."
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[Баланс скрыт]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr ""
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "добавьте вашу BitPay Visa карту(ы)"
@@ -3425,7 +3545,7 @@ msgstr "добавьте вашу BitPay Visa карту(ы)"
msgid "locked by pending payments"
msgstr "заблокировано неподтверждёнными платежами"
-#: src/js/services/profileService.js:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "мне"
@@ -3437,25 +3557,11 @@ msgstr "name@example.com"
msgid "preparing..."
msgstr "Подготавливается..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "принять"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "оплатить"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "отправить"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr ""
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
msgstr ""
@@ -3463,7 +3569,7 @@ msgstr ""
msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)."
msgstr "{{appName}} требует Bitcore для координации совладельцев и получения информации из блокчейна. По-умолчанию используется сервер https://bws.bitpay.com (публичный сервер Bitcore компании BitPay)."
-#: src/js/controllers/confirm.js:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} будет использовано для оплаты комиссии."
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} будет использовано для оплаты коми
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr ""
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "{{updatingTxHistoryProgress}} транзакций загружено"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}-из-{{wallet.n}}"
diff --git a/i18n/po/zh.po b/i18n/po/zh.po
index 37c98e29b..153c19706 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-08-16 09:23-0400\n"
+"PO-Revision-Date: 2017-09-19 14:07-0400\n"
#: www/views/modals/paypro.html:34
msgid "(Trusted)"
@@ -48,31 +48,31 @@ msgstr "Only 可随时取现的梅尔卡多里弗 (巴西)"
msgid "A member of the team will review your feedback as soon as possible."
msgstr "团队的成员将尽快审查您的反馈意见。"
-#: src/js/controllers/confirm.js:351
+#: src/js/controllers/confirm.js:380
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
msgstr "备注︰共有{{amountAboveMaxSizeStr}} 被排除了。超出了交易允许的最大体积"
-#: src/js/controllers/confirm.js:345
+#: src/js/controllers/confirm.js:374
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:156
+#: www/views/tab-settings.html:161
msgid "About"
msgstr "关于"
-#: src/js/controllers/modals/txpDetails.js:56
-#: src/js/controllers/tx-details.js:62
+#: src/js/controllers/modals/txpDetails.js:62
+#: src/js/controllers/tx-details.js:79
msgid "Accepted"
msgstr "同意"
-#: www/views/preferencesInformation.html:66
+#: www/views/preferencesInformation.html:72
msgid "Account"
msgstr "帐户"
-#: www/views/join.html:69
-#: www/views/tab-create-personal.html:43
-#: www/views/tab-create-shared.html:72
+#: www/views/join.html:72
+#: www/views/tab-create-personal.html:45
+#: www/views/tab-create-shared.html:74
#: www/views/tab-import-hardware.html:19
msgid "Account Number"
msgstr "帐号"
@@ -106,9 +106,9 @@ msgstr "添加金额"
msgid "Add Memo"
msgstr "添加备注"
-#: www/views/join.html:84
-#: www/views/tab-create-personal.html:57
-#: www/views/tab-create-shared.html:86
+#: www/views/join.html:87
+#: www/views/tab-create-personal.html:59
+#: www/views/tab-create-shared.html:88
msgid "Add a password"
msgstr "添加密码"
@@ -116,9 +116,9 @@ msgstr "添加密码"
msgid "Add account"
msgstr "添加帐户"
-#: www/views/join.html:87
-#: www/views/tab-create-personal.html:60
-#: www/views/tab-create-shared.html:89
+#: www/views/join.html:90
+#: www/views/tab-create-personal.html:62
+#: www/views/tab-create-shared.html:91
msgid "Add an optional password to secure the recovery phrase"
msgstr "添加可选的密码,以保护恢复短语"
@@ -126,7 +126,7 @@ msgstr "添加可选的密码,以保护恢复短语"
msgid "Add as a contact"
msgstr "添加到联系人"
-#: src/js/controllers/confirm.js:374
+#: src/js/controllers/confirm.js:403
msgid "Add description"
msgstr "添加描述"
@@ -153,7 +153,7 @@ msgstr "地址"
msgid "Address Book"
msgstr "地址簿"
-#: www/views/preferencesInformation.html:35
+#: www/views/preferencesInformation.html:41
msgid "Address Type"
msgstr "地址类型"
@@ -161,7 +161,7 @@ msgstr "地址类型"
msgid "Addresses With Balance"
msgstr "地址与余额"
-#: www/views/tab-settings.html:149
+#: www/views/tab-settings.html:154
msgid "Advanced"
msgstr "進階"
@@ -198,11 +198,11 @@ msgid "Almost done! Let's review."
msgstr "差不多完成了 !让我们回顾一下。"
#: www/views/preferencesAltCurrency.html:4
-#: www/views/tab-settings.html:74
+#: www/views/tab-settings.html:79
msgid "Alternative Currency"
msgstr "替代货币"
-#: src/js/controllers/buyAmazon.js:97
+#: src/js/controllers/buyAmazon.js:98
msgid "Amazon.com is not available at this moment. Please try back later."
msgstr "亚马逊服务器暂时不可用,请稍候再试。"
@@ -216,7 +216,7 @@ msgstr "数额"
msgid "Amount below minimum allowed"
msgstr "数额低于最低允许值"
-#: src/js/controllers/confirm.js:191
+#: src/js/controllers/confirm.js:195
msgid "Amount too big"
msgstr "量太大"
@@ -256,11 +256,11 @@ msgstr "你确定你要删除此联系人?"
msgid "Are you sure you want to delete this wallet?"
msgstr "确定要删除这钱包?"
-#: src/js/controllers/modals/txpDetails.js:148
+#: src/js/controllers/modals/txpDetails.js:154
msgid "Are you sure you want to reject this transaction?"
msgstr "确定拒绝这笔交易?"
-#: src/js/controllers/modals/txpDetails.js:165
+#: src/js/controllers/modals/txpDetails.js:171
msgid "Are you sure you want to remove this transaction?"
msgstr "确定要删除这项交易吗?"
@@ -277,7 +277,7 @@ msgstr "你确定你要登出你的BitPay Card账户?"
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
msgstr "你确定你想要从这个设备中删除您的 BitPay 卡 ({{lastFourDigits}})吗?"
-#: www/views/includes/walletInfo.html:5
+#: www/views/includes/walletInfo.html:10
msgid "Auditable"
msgstr "可审核"
@@ -294,13 +294,17 @@ msgstr "可用余额"
msgid "Average confirmation time"
msgstr "平均确认时间"
-#: www/views/join.html:140
-#: www/views/tab-create-personal.html:111
-#: www/views/tab-create-shared.html:140
-#: www/views/tab-import-phrase.html:48
+#: www/views/join.html:143
+#: www/views/tab-create-personal.html:113
+#: www/views/tab-create-shared.html:142
+#: www/views/tab-import-phrase.html:51
msgid "BIP32 path for address derivation"
msgstr "BIP32 路径的地址衍生"
+#: www/views/cashScan.html:22
+msgid "BTC Wallets"
+msgstr ""
+
#: www/views/preferences.html:34
msgid "Backup"
msgstr "备份"
@@ -314,7 +318,7 @@ msgid "Backup all livenet wallets before using this function"
msgstr "请在使用此功能之前备份你的钱包。"
#: www/views/preferences.html:36
-#: www/views/tab-settings.html:120
+#: www/views/tab-settings.html:125
msgid "Backup needed"
msgstr "需要备份"
@@ -331,11 +335,11 @@ msgstr "备份钱包"
msgid "Backup your wallet before using this function"
msgstr "在使用此功能之前,请备份你的钱包。"
-#: src/js/services/profileService.js:430
+#: src/js/services/profileService.js:445
msgid "Bad wallet invitation"
msgstr "坏钱包邀请"
-#: www/views/preferencesInformation.html:96
+#: www/views/preferencesInformation.html:102
msgid "Balance By Address"
msgstr "地址余额"
@@ -352,15 +356,24 @@ msgstr "BitPay Visa® 牌"
msgid "Bitcoin Address"
msgstr "比特币地址"
+#: www/views/cashScan.html:4
+msgid "Bitcoin Cash (BCH) Balances"
+msgstr ""
+
+#: www/views/preferencesCash.html:3
+#: www/views/tab-settings.html:47
+msgid "Bitcoin Cash Support"
+msgstr ""
+
#: www/views/modals/chooseFeeLevel.html:4
#: www/views/preferencesFee.html:4
-#: www/views/tab-settings.html:85
+#: www/views/tab-settings.html:90
msgid "Bitcoin Network Fee Policy"
msgstr "比特币网络手续费策略"
-#: www/views/tab-settings.html:63
-msgid "Bitcoin Unit"
-msgstr "比特币单位"
+#: src/js/services/incomingData.js:151
+msgid "Bitcoin cash Payment"
+msgstr ""
#: www/views/onboarding/tour.html:31
msgid "Bitcoin is a currency."
@@ -386,8 +399,8 @@ msgstr "买了{{amountUnitStr}}"
msgid "Broadcast Payment"
msgstr "广播支付"
-#: src/js/controllers/modals/txpDetails.js:58
-#: src/js/controllers/tx-details.js:64
+#: src/js/controllers/modals/txpDetails.js:64
+#: src/js/controllers/tx-details.js:81
msgid "Broadcasted"
msgstr "广播商"
@@ -417,7 +430,7 @@ msgstr "购买比特币"
msgid "Buy a Gift Card"
msgstr "买一张礼品卡"
-#: src/js/controllers/buyAmazon.js:332
+#: src/js/controllers/buyAmazon.js:334
msgid "Buy from"
msgstr "从什么地方购买"
@@ -429,10 +442,11 @@ msgstr "正在发送 比特币..."
msgid "Calculating fee"
msgstr "正在计算费用"
-#: src/js/controllers/buyAmazon.js:311
-#: src/js/controllers/buyMercadoLibre.js:305
-#: src/js/controllers/confirm.js:495
-#: src/js/controllers/topup.js:285
+#: src/js/controllers/buyAmazon.js:313
+#: src/js/controllers/buyMercadoLibre.js:307
+#: src/js/controllers/confirm.js:529
+#: src/js/controllers/topup.js:287
+#: src/js/services/incomingData.js:154
#: src/js/services/popupService.js:62
#: src/js/services/popupService.js:73
#: www/views/addressbook.add.html:10
@@ -455,7 +469,7 @@ msgstr "取消邀请"
msgid "Cannot Create Wallet"
msgstr "不能创建钱包"
-#: src/js/services/profileService.js:426
+#: src/js/services/profileService.js:441
msgid "Cannot join the same wallet more that once"
msgstr "无法重复加入同一个钱包"
@@ -491,9 +505,19 @@ msgstr "清除"
msgid "Clear cache"
msgstr "清空缓存"
-#: src/js/controllers/modals/txpDetails.js:34
-msgid "Click"
-msgstr "点击"
+#: src/js/controllers/confirm.js:352
+#: src/js/controllers/modals/txpDetails.js:49
+msgid "Click to accept"
+msgstr ""
+
+#: src/js/controllers/confirm.js:346
+msgid "Click to pay"
+msgstr ""
+
+#: src/js/controllers/confirm.js:358
+#: src/js/controllers/modals/txpDetails.js:42
+msgid "Click to send"
+msgstr ""
#: www/views/customAmount.html:4
#: www/views/modals/mercadolibre-card-details.html:3
@@ -505,6 +529,11 @@ msgstr "点击"
msgid "Close"
msgstr "关闭"
+#: www/views/includes/cash.html:2
+#: www/views/preferencesInformation.html:17
+msgid "Coin"
+msgstr ""
+
#: www/views/preferences.html:22
msgid "Color"
msgstr "颜色"
@@ -513,7 +542,7 @@ msgstr "颜色"
msgid "Commit hash"
msgstr "提交哈希"
-#: www/views/preferences.html:48
+#: www/views/preferences.html:49
msgid "Complete the backup process to use this option"
msgstr "要使用此选项,请先完成备份。"
@@ -521,11 +550,11 @@ msgstr "要使用此选项,请先完成备份。"
msgid "Completed"
msgstr "完成"
-#: src/js/controllers/buyAmazon.js:309
-#: src/js/controllers/buyMercadoLibre.js:303
-#: src/js/controllers/confirm.js:494
+#: src/js/controllers/buyAmazon.js:311
+#: src/js/controllers/buyMercadoLibre.js:305
+#: src/js/controllers/confirm.js:528
#: src/js/controllers/copayers.js:55
-#: src/js/controllers/topup.js:283
+#: src/js/controllers/topup.js:285
#: www/views/backup.html:53
#: www/views/backup.html:72
#: www/views/confirm.html:4
@@ -547,11 +576,11 @@ msgstr "确认购买"
msgid "Confirm your PIN"
msgstr "确认你的PIN码"
-#: src/js/services/walletService.js:1034
+#: src/js/services/walletService.js:1033
msgid "Confirm your new spending password"
msgstr "确认你的新支付密码"
-#: www/views/tx-details.html:98
+#: www/views/tx-details.html:100
msgid "Confirmations"
msgstr "确认"
@@ -604,7 +633,7 @@ msgstr "Copayer 的数据不匹配"
msgid "Copayer joined"
msgstr "Copayer 加入"
-#: www/views/preferencesInformation.html:88
+#: www/views/preferencesInformation.html:94
msgid "Copayer {{$index}}"
msgstr "Copayer {{$index}}"
@@ -626,7 +655,7 @@ msgstr "将此文本复制到一个安全的地方(记事本或电子邮件)
msgid "Copy to clipboard"
msgstr "复制到剪贴板"
-#: src/js/controllers/buyMercadoLibre.js:101
+#: src/js/controllers/buyMercadoLibre.js:102
msgid "Could not access Gift Card Service"
msgstr "不能访问礼品卡服务"
@@ -634,19 +663,19 @@ msgstr "不能访问礼品卡服务"
msgid "Could not access the wallet at the server. Please check:"
msgstr "无法访问服务器上的钱包。请确认︰"
-#: src/js/controllers/buyAmazon.js:101
+#: src/js/controllers/buyAmazon.js:102
msgid "Could not access to Amazon.com"
msgstr "不能访问到亚马逊网站"
-#: src/js/services/profileService.js:493
+#: src/js/services/profileService.js:510
msgid "Could not access wallet"
msgstr "无法访问钱包"
-#: src/js/controllers/confirm.js:185
+#: src/js/controllers/confirm.js:189
msgid "Could not add message to imported wallet without shared encrypting key"
msgstr "无法将消息添加到进口钱包没有共享的加密密钥"
-#: src/js/controllers/modals/txpDetails.js:193
+#: src/js/controllers/modals/txpDetails.js:199
msgid "Could not broadcast payment"
msgstr "无法广播支付"
@@ -654,45 +683,49 @@ msgstr "无法广播支付"
msgid "Could not build transaction"
msgstr "无法建立交易"
-#: src/js/services/walletService.js:857
+#: src/js/services/walletService.js:854
msgid "Could not create address"
msgstr "无法创建地址"
-#: src/js/controllers/topup.js:91
+#: src/js/controllers/topup.js:92
msgid "Could not create the invoice"
msgstr "不能创建发票"
-#: src/js/controllers/buyAmazon.js:163
-#: src/js/controllers/buyMercadoLibre.js:163
-#: src/js/controllers/topup.js:141
+#: src/js/controllers/buyAmazon.js:164
+#: src/js/controllers/buyMercadoLibre.js:164
+#: src/js/controllers/topup.js:142
msgid "Could not create transaction"
msgstr "无法创建交易记录"
-#: src/js/services/profileService.js:342
+#: src/js/services/profileService.js:351
msgid "Could not create using the specified extended private key"
msgstr "无法使用指定的扩展私人密钥创建"
-#: src/js/services/profileService.js:353
+#: src/js/services/profileService.js:363
msgid "Could not create using the specified extended public key"
msgstr "无法使用指定的扩展的公钥创建"
-#: src/js/services/profileService.js:335
+#: src/js/services/profileService.js:339
msgid "Could not create: Invalid wallet recovery phrase"
msgstr "无法创建 ︰ 无效的钱包恢复短语"
-#: src/js/controllers/import.js:99
+#: src/js/controllers/import.js:114
msgid "Could not decrypt file, check your password"
msgstr "无法解密文件,请检查你的密码"
-#: src/js/controllers/modals/txpDetails.js:175
+#: src/js/controllers/modals/txpDetails.js:181
msgid "Could not delete payment proposal"
msgstr "无法删除支付提议"
-#: src/js/services/feeService.js:72
+#: src/js/controllers/cashScan.js:101
+msgid "Could not duplicate"
+msgstr ""
+
+#: src/js/services/feeService.js:73
msgid "Could not get dynamic fee"
msgstr "不能动态费用"
-#: src/js/services/feeService.js:42
+#: src/js/services/feeService.js:43
msgid "Could not get dynamic fee for level: {{feeLevel}}"
msgstr "无法获取水平动态费用︰ {{feeLevel}}"
@@ -700,9 +733,9 @@ msgstr "无法获取水平动态费用︰ {{feeLevel}}"
msgid "Could not get fee levels"
msgstr "无法获取费率"
-#: src/js/controllers/buyAmazon.js:121
-#: src/js/controllers/buyMercadoLibre.js:121
-#: src/js/controllers/topup.js:99
+#: src/js/controllers/buyAmazon.js:122
+#: src/js/controllers/buyMercadoLibre.js:122
+#: src/js/controllers/topup.js:100
msgid "Could not get the invoice"
msgstr "不能拿到发票"
@@ -710,21 +743,21 @@ msgstr "不能拿到发票"
msgid "Could not get transactions"
msgstr "不能交易"
-#: src/js/services/profileService.js:597
-#: src/js/services/profileService.js:631
-#: src/js/services/profileService.js:654
+#: src/js/services/profileService.js:614
+#: src/js/services/profileService.js:649
+#: src/js/services/profileService.js:673
msgid "Could not import"
msgstr "无法导入"
-#: src/js/services/profileService.js:566
+#: src/js/services/profileService.js:583
msgid "Could not import. Check input file and spending password"
msgstr "无法导入。请检查输入文件和支付密码"
-#: src/js/services/profileService.js:439
+#: src/js/services/profileService.js:456
msgid "Could not join wallet"
msgstr "无法加入钱包"
-#: src/js/controllers/modals/txpDetails.js:155
+#: src/js/controllers/modals/txpDetails.js:161
msgid "Could not reject payment"
msgstr "无法拒绝支付"
@@ -741,22 +774,22 @@ msgstr "无法删除卡"
msgid "Could not save preferences on the server"
msgstr "无法在服务器上保存首选项"
-#: src/js/controllers/modals/txpDetails.js:141
+#: src/js/controllers/modals/txpDetails.js:147
msgid "Could not send payment"
msgstr "无法发送支付"
-#: src/js/controllers/buyAmazon.js:323
-#: src/js/controllers/buyMercadoLibre.js:316
-#: src/js/controllers/topup.js:297
+#: src/js/controllers/buyAmazon.js:325
+#: src/js/controllers/buyMercadoLibre.js:318
+#: src/js/controllers/topup.js:299
msgid "Could not send transaction"
msgstr "无法发送交易记录"
-#: www/views/walletDetails.html:198
+#: www/views/walletDetails.html:210
msgid "Could not update transaction history"
msgstr "无法更新交易历史记录"
-#: src/js/controllers/addresses.js:34
-#: src/js/controllers/addresses.js:42
+#: src/js/controllers/addresses.js:29
+#: src/js/controllers/addresses.js:37
#: src/js/controllers/copayers.js:30
#: src/js/controllers/walletDetails.js:78
msgid "Could not update wallet"
@@ -776,7 +809,7 @@ msgstr "创建自己的免费钱包"
msgid "Create bitcoin wallet"
msgstr "创建比特币的钱包"
-#: www/views/tab-create-personal.html:129
+#: www/views/tab-create-personal.html:131
msgid "Create new wallet"
msgstr "创建新钱包"
@@ -784,7 +817,7 @@ msgstr "创建新钱包"
msgid "Create shared wallet"
msgstr "创建共享的钱包"
-#: www/views/tab-create-shared.html:158
+#: www/views/tab-create-shared.html:160
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr "创建 {{formData.requiredCopayers}} 的{{formData.totalCopayers}} 钱包"
@@ -814,7 +847,7 @@ msgstr "自定义"
msgid "Custom Amount"
msgstr "自定义金额"
-#: src/js/controllers/preferencesFee.js:84
+#: src/js/controllers/preferencesFee.js:85
msgid "Custom Fee"
msgstr "使用自定义费率"
@@ -849,14 +882,14 @@ msgstr "正在删除钱包..."
msgid "Deleting payment proposal"
msgstr "删除付款方案"
-#: www/views/join.html:138
-#: www/views/tab-create-personal.html:109
-#: www/views/tab-create-shared.html:138
-#: www/views/tab-import-phrase.html:46
+#: www/views/join.html:141
+#: www/views/tab-create-personal.html:111
+#: www/views/tab-create-shared.html:140
+#: www/views/tab-import-phrase.html:49
msgid "Derivation Path"
msgstr "衍生路径"
-#: www/views/preferencesInformation.html:41
+#: www/views/preferencesInformation.html:47
msgid "Derivation Strategy"
msgstr "衍生策略"
@@ -868,7 +901,8 @@ msgid "Details"
msgstr "详情"
#: src/js/controllers/lockSetup.js:9
-#: src/js/controllers/tab-settings.js:60
+#: src/js/controllers/tab-settings.js:64
+#: www/views/tab-settings.html:50
msgid "Disabled"
msgstr "已经禁用"
@@ -890,6 +924,14 @@ msgstr "在 Crowdin 找不到你的语言?请联系 Crowdin 的所有者!我
msgid "Download"
msgstr "下载"
+#: www/views/cashScan.html:36
+msgid "Duplicate for BCH"
+msgstr ""
+
+#: src/js/services/onGoingProcess.js:49
+msgid "Duplicating wallet..."
+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."
msgstr "每个比特币钱包可以从您的 12 字备份生成亿万个地址。一个新的地址是自动生成和显示每个时间你收到付款。"
@@ -915,6 +957,10 @@ msgstr "电子邮件地址"
msgid "Empty addresses limit reached. New addresses cannot be generated."
msgstr "已达到空地址限制。无法生成新的地址。"
+#: www/views/preferencesCash.html:17
+msgid "Enable Bitcoin Cash wallet creation and operation within the App."
+msgstr ""
+
#: www/views/tab-scan.html:19
msgid "Enable camera access in your device settings to get started."
msgstr "相机中启用访问您的设备设置入门。"
@@ -931,8 +977,12 @@ msgstr "启用推式通知"
msgid "Enable the camera to get started."
msgstr "使该摄像机开始。"
-#: src/js/services/walletService.js:1048
-#: src/js/services/walletService.js:1063
+#: www/views/tab-settings.html:49
+msgid "Enabled"
+msgstr ""
+
+#: src/js/services/walletService.js:1047
+#: src/js/services/walletService.js:1062
msgid "Enter Spending Password"
msgstr "输入支出密码"
@@ -948,13 +998,13 @@ msgstr "输入金额"
msgid "Enter custom fee"
msgstr "输入自定义费率"
-#: src/js/services/walletService.js:1030
+#: src/js/services/walletService.js:1029
msgid "Enter new spending password"
msgstr "输入新的消费密码"
-#: www/views/join.html:76
-#: www/views/tab-create-personal.html:49
-#: www/views/tab-create-shared.html:78
+#: www/views/join.html:79
+#: www/views/tab-create-personal.html:51
+#: www/views/tab-create-shared.html:80
msgid "Enter the recovery phrase (BIP39)"
msgstr "输入恢复短语 (BIP39)"
@@ -970,23 +1020,24 @@ msgstr "请输入你的密码"
#: src/js/controllers/activity.js:45
#: src/js/controllers/addressbookAdd.js:30
#: src/js/controllers/addressbookView.js:29
-#: src/js/controllers/addresses.js:130
-#: src/js/controllers/addresses.js:131
+#: src/js/controllers/addresses.js:125
+#: src/js/controllers/addresses.js:126
#: src/js/controllers/bitpayCard.js:66
#: src/js/controllers/bitpayCardIntro.js:40
#: src/js/controllers/bitpayCardIntro.js:81
-#: src/js/controllers/buyAmazon.js:23
-#: src/js/controllers/buyAmazon.js:34
-#: src/js/controllers/buyMercadoLibre.js:23
-#: src/js/controllers/buyMercadoLibre.js:34
-#: src/js/controllers/confirm.js:276
+#: src/js/controllers/buyAmazon.js:24
+#: 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/copayers.js:67
-#: src/js/controllers/create.js:155
-#: src/js/controllers/create.js:168
-#: src/js/controllers/create.js:175
-#: src/js/controllers/create.js:197
-#: src/js/controllers/create.js:204
-#: src/js/controllers/create.js:222
+#: src/js/controllers/create.js:161
+#: src/js/controllers/create.js:174
+#: src/js/controllers/create.js:180
+#: src/js/controllers/create.js:186
+#: src/js/controllers/create.js:208
+#: src/js/controllers/create.js:215
+#: src/js/controllers/create.js:233
#: src/js/controllers/export.js:109
#: src/js/controllers/export.js:115
#: src/js/controllers/export.js:126
@@ -996,32 +1047,33 @@ msgstr "请输入你的密码"
#: src/js/controllers/export.js:47
#: src/js/controllers/export.js:53
#: src/js/controllers/feedback/send.js:23
-#: src/js/controllers/import.js:104
-#: src/js/controllers/import.js:116
-#: src/js/controllers/import.js:134
-#: src/js/controllers/import.js:185
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:222
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:249
-#: src/js/controllers/import.js:260
-#: src/js/controllers/import.js:270
-#: src/js/controllers/import.js:294
-#: src/js/controllers/import.js:307
-#: src/js/controllers/import.js:317
-#: src/js/controllers/import.js:327
-#: src/js/controllers/import.js:351
-#: src/js/controllers/import.js:364
-#: src/js/controllers/import.js:70
-#: src/js/controllers/import.js:83
-#: src/js/controllers/join.js:121
-#: src/js/controllers/join.js:135
-#: src/js/controllers/join.js:142
-#: src/js/controllers/join.js:165
-#: src/js/controllers/join.js:173
-#: src/js/controllers/join.js:191
+#: src/js/controllers/import.js:119
+#: src/js/controllers/import.js:131
+#: src/js/controllers/import.js:149
+#: src/js/controllers/import.js:200
+#: src/js/controllers/import.js:229
+#: 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:312
+#: src/js/controllers/import.js:325
+#: src/js/controllers/import.js:335
+#: src/js/controllers/import.js:345
+#: src/js/controllers/import.js:369
+#: src/js/controllers/import.js:382
+#: src/js/controllers/import.js:85
+#: src/js/controllers/import.js:98
+#: src/js/controllers/join.js:125
+#: src/js/controllers/join.js:139
+#: src/js/controllers/join.js:145
+#: src/js/controllers/join.js:151
+#: src/js/controllers/join.js:174
+#: src/js/controllers/join.js:182
+#: src/js/controllers/join.js:200
#: src/js/controllers/modals/feeLevels.js:9
-#: src/js/controllers/modals/txpDetails.js:134
+#: src/js/controllers/modals/txpDetails.js:140
#: src/js/controllers/paperWallet.js:47
#: src/js/controllers/preferencesBitpayCard.js:20
#: src/js/controllers/preferencesBitpayServices.js:33
@@ -1029,42 +1081,44 @@ 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:132
+#: src/js/controllers/tab-send.js:133
#: src/js/controllers/tabsController.js:36
#: src/js/controllers/tabsController.js:7
-#: src/js/controllers/topup.js:20
-#: src/js/controllers/topup.js:31
-#: src/js/controllers/tx-details.js:102
-#: src/js/services/incomingData.js:98
+#: src/js/controllers/topup.js:21
+#: src/js/controllers/topup.js:32
+#: src/js/controllers/tx-details.js:119
+#: src/js/services/incomingData.js:101
+#: src/js/services/incomingData.js:125
+#: src/js/services/incomingData.js:168
#: www/views/mercadoLibreCards.html:19
#: www/views/modals/mercadolibre-card-details.html:45
msgid "Error"
msgstr "错误!"
-#: src/js/controllers/confirm.js:447
+#: src/js/controllers/confirm.js:481
msgid "Error at confirm"
msgstr "在确认错误"
-#: src/js/controllers/buyAmazon.js:178
+#: src/js/controllers/buyAmazon.js:179
msgid "Error creating gift card"
msgstr "错误创建礼品卡"
-#: src/js/controllers/buyAmazon.js:93
-#: src/js/controllers/buyMercadoLibre.js:93
+#: src/js/controllers/buyAmazon.js:94
+#: src/js/controllers/buyMercadoLibre.js:94
msgid "Error creating the invoice"
msgstr "创建发票时出错"
-#: src/js/services/profileService.js:396
+#: src/js/services/profileService.js:411
msgid "Error creating wallet"
msgstr "创建钱包时出现错误"
-#: src/js/controllers/confirm.js:266
+#: src/js/controllers/confirm.js:275
msgid "Error getting SendMax information"
msgstr "获取SendMax信息时出错。"
-#: src/js/controllers/buyAmazon.js:135
-#: src/js/controllers/buyMercadoLibre.js:135
-#: src/js/controllers/topup.js:113
+#: src/js/controllers/buyAmazon.js:136
+#: src/js/controllers/buyMercadoLibre.js:136
+#: src/js/controllers/topup.js:114
msgid "Error in Payment Protocol"
msgstr "付款协议中的错误"
@@ -1076,7 +1130,7 @@ msgstr "错误配对 BitPay 帐户"
msgid "Error scanning funds:"
msgstr "错误扫描资金︰"
-#: src/js/controllers/paperWallet.js:91
+#: src/js/controllers/paperWallet.js:90
msgid "Error sweeping wallet:"
msgstr "错误清扫钱包︰"
@@ -1088,7 +1142,7 @@ msgstr "更新借记卡时出错"
msgid "Exceeded daily limit of $500 per user"
msgstr "超过 500 美元,每个用户的每日限额"
-#: src/js/controllers/confirm.js:411
+#: src/js/controllers/confirm.js:440
#: www/views/confirm.html:27
#: www/views/mercadoLibreCards.html:25
#: www/views/modals/mercadolibre-card-details.html:34
@@ -1114,12 +1168,12 @@ msgstr "导出到文件"
msgid "Export wallet"
msgstr "导出钱包"
-#: src/js/services/walletService.js:1175
+#: src/js/services/walletService.js:1174
#: www/views/tab-export-qrCode.html:9
msgid "Exporting via QR not supported for this wallet"
msgstr "此钱包不支持通过 QR 的导出"
-#: www/views/preferencesInformation.html:83
+#: www/views/preferencesInformation.html:89
msgid "Extended Public Keys"
msgstr "扩展的公钥"
@@ -1188,12 +1242,12 @@ msgstr "指纹扫描失败"
msgid "Finish"
msgstr "完成"
-#: www/views/tab-create-personal.html:121
-#: www/views/tab-create-shared.html:150
+#: www/views/tab-create-personal.html:123
+#: www/views/tab-create-shared.html:152
msgid "For audit purposes"
msgstr "供审计目的"
-#: src/js/controllers/topup.js:306
+#: src/js/controllers/topup.js:308
#: www/views/buyAmazon.html:29
#: www/views/buyMercadoLibre.html:28
#: www/views/confirm.html:65
@@ -1207,7 +1261,7 @@ msgstr "来自"
msgid "From BitPay account"
msgstr "从 BitPay 帐户"
-#: www/views/tab-import-phrase.html:54
+#: www/views/tab-import-phrase.html:57
msgid "From Hardware Wallet"
msgstr "从硬件钱包"
@@ -1286,7 +1340,7 @@ msgstr "礼品卡不可再使用"
msgid "Gift card"
msgstr "礼品卡"
-#: src/js/controllers/buyAmazon.js:203
+#: src/js/controllers/buyAmazon.js:204
msgid "Gift card expired"
msgstr "礼品卡过期"
@@ -1297,11 +1351,14 @@ msgstr "礼品卡生成并准备使用。"
#: src/js/controllers/bitpayCard.js:114
#: src/js/controllers/bitpayCard.js:124
#: 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:48
-#: src/js/controllers/tx-details.js:176
+#: src/js/controllers/tab-settings.js:52
+#: src/js/controllers/tx-details.js:193
+#: src/js/controllers/tx-details.js:56
msgid "Go Back"
msgstr "返回 #"
@@ -1317,8 +1374,8 @@ msgstr "上一页"
msgid "Got it"
msgstr "收到!"
-#: www/views/preferencesInformation.html:47
#: www/views/preferencesInformation.html:53
+#: www/views/preferencesInformation.html:59
msgid "Hardware Wallet"
msgstr "硬件钱包"
@@ -1330,12 +1387,17 @@ msgstr "硬件未连接"
msgid "Hardware wallet"
msgstr "硬件钱包"
+#: src/js/controllers/create.js:180
+#: src/js/controllers/join.js:145
+msgid "Hardware wallets are not yet supported with Bitcoin Cash"
+msgstr ""
+
#: www/views/tab-settings.html:20
msgid "Help & Support"
msgstr "帮助与支持"
#: src/js/controllers/bitpayCard.js:112
-#: src/js/controllers/tab-settings.js:46
+#: src/js/controllers/tab-settings.js:50
msgid "Help and support information is available at the website."
msgstr "帮助&支持现在是可用的"
@@ -1347,17 +1409,17 @@ msgstr "隱藏"
msgid "Hide Balance"
msgstr "隐藏的平衡"
-#: www/views/advancedSettings.html:29
+#: www/views/advancedSettings.html:30
msgid "Hide Next Steps Card"
msgstr "隐藏下一个步骤卡"
-#: www/views/join.html:46
-#: www/views/tab-create-personal.html:26
-#: www/views/tab-create-shared.html:55
+#: www/views/join.html:49
+#: www/views/tab-create-personal.html:28
+#: www/views/tab-create-shared.html:57
#: www/views/tab-export-file.html:25
-#: www/views/tab-import-file.html:28
+#: www/views/tab-import-file.html:30
#: www/views/tab-import-hardware.html:31
-#: www/views/tab-import-phrase.html:33
+#: www/views/tab-import-phrase.html:36
msgid "Hide advanced options"
msgstr "隐藏高级选项"
@@ -1387,9 +1449,9 @@ msgstr "我已经阅读、 理解并同意 get started with bitcoin."
msgstr "把你的钱,
得到控制开始用比特币。"
-#: www/views/walletDetails.html:139
-#: www/views/walletDetails.html:59
+#: www/views/walletDetails.html:132
+#: www/views/walletDetails.html:52
msgid "Tap and hold to show"
msgstr "点击并按住以显示"
-#: www/views/walletDetails.html:111
-#: www/views/walletDetails.html:31
+#: www/views/includes/walletInfo.html:3
+msgid "Tap to recreate"
+msgstr ""
+
+#: www/views/includes/walletInfo.html:4
msgid "Tap to retry"
msgstr "点击以重试"
@@ -2690,8 +2808,8 @@ msgstr "使用条件"
msgid "Terms of Use"
msgstr "使用条款"
-#: www/views/tab-create-personal.html:116
-#: www/views/tab-import-phrase.html:65
+#: www/views/tab-create-personal.html:118
+#: www/views/tab-import-phrase.html:68
msgid "Testnet"
msgstr "Testnet"
@@ -2754,7 +2872,7 @@ msgstr "官方的英语术语服务是可在 BitPay 网站上。"
msgid "The password of the recovery phrase (if set)"
msgstr "恢复短语的密码 (如已设置)"
-#: src/js/services/walletService.js:1140
+#: src/js/services/walletService.js:1139
msgid "The payment was created but could not be completed. Please try again from home screen"
msgstr "支付已创建,但无法完成。请从首页再试一次"
@@ -2762,10 +2880,10 @@ msgstr "支付已创建,但无法完成。请从首页再试一次"
msgid "The payment was removed by creator"
msgstr "支付已被创建者移除"
-#: www/views/join.html:88
-#: www/views/tab-create-personal.html:61
-#: www/views/tab-create-shared.html:90
-#: www/views/tab-import-phrase.html:40
+#: www/views/join.html:91
+#: www/views/tab-create-personal.html:63
+#: www/views/tab-create-shared.html:92
+#: www/views/tab-import-phrase.html:43
msgid "The recovery phrase could require a password to be imported"
msgstr "恢复短语需要密码才能导入"
@@ -2797,9 +2915,9 @@ msgstr "钱包服务 URL"
msgid "There is a new version of {{appName}} available"
msgstr "有可用的新版本的 {{appName}}"
-#: src/js/controllers/import.js:213
-#: src/js/controllers/import.js:237
-#: src/js/controllers/import.js:317
+#: src/js/controllers/import.js:229
+#: src/js/controllers/import.js:254
+#: src/js/controllers/import.js:335
msgid "There is an error in the form"
msgstr "表格中有错误"
@@ -2816,13 +2934,13 @@ msgstr "这个应用程序太棒了 !"
msgid "This app stores your bitcoin with cutting-edge security."
msgstr "此应用程序商店你比特币与尖端的安全。"
-#: src/js/controllers/confirm.js:468
+#: src/js/controllers/confirm.js:502
msgid "This bitcoin payment request has expired."
msgstr "这比特币付款请求已过期。"
-#: www/views/join.html:130
-#: www/views/tab-create-personal.html:101
-#: www/views/tab-create-shared.html:130
+#: www/views/join.html:133
+#: www/views/tab-create-personal.html:103
+#: www/views/tab-create-shared.html:132
msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds."
msgstr "此密码将无法恢复。如果密码丢失,有是没有办法,你可以恢复您的资金。"
@@ -2838,13 +2956,13 @@ msgstr "相对于当前比特币网络费,这笔交易金额太小。手续费
msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender"
msgstr "这笔交易可能需要很长的时间来确认或可能受到由发件人设置的低费用下降"
-#: www/views/walletDetails.html:115
-#: www/views/walletDetails.html:35
+#: www/views/walletDetails.html:109
+#: www/views/walletDetails.html:29
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:121
+#: www/views/tx-details.html:123
msgid "Timeline"
msgstr "时间轴"
@@ -2873,7 +2991,7 @@ msgstr "到 {{reason}},您必须首先添加您的 BitPay 帐户-{{email}}"
msgid "Top up in progress..."
msgstr "在进展充值..."
-#: src/js/controllers/topup.js:205
+#: src/js/controllers/topup.js:206
msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
msgstr "充值 {{amountStr}},记入借方卡 ({{cardLastNumber}})"
@@ -2884,11 +3002,11 @@ msgstr "充值 {{amountStr}},记入借方卡 ({{cardLastNumber}})"
msgid "Total"
msgstr "总计"
-#: www/views/walletDetails.html:184
+#: www/views/walletDetails.html:196
msgid "Total Locked Balance"
msgstr "锁定结余的总额"
-#: www/views/tab-create-shared.html:33
+#: www/views/tab-create-shared.html:35
msgid "Total number of copayers"
msgstr "Copayers 的总数"
@@ -2901,7 +3019,7 @@ msgstr "钱包总共进账"
msgid "Touch ID Failed"
msgstr "触摸 ID 失败"
-#: src/js/controllers/tx-details.js:11
+#: src/js/controllers/tx-details.js:12
msgid "Transaction"
msgstr "交易"
@@ -2918,9 +3036,9 @@ msgstr "交易历史记录"
msgid "Transaction already broadcasted"
msgstr "交易已经广播"
-#: src/js/controllers/buyAmazon.js:306
-#: src/js/controllers/buyMercadoLibre.js:299
-#: src/js/controllers/topup.js:279
+#: src/js/controllers/buyAmazon.js:308
+#: src/js/controllers/buyMercadoLibre.js:301
+#: src/js/controllers/topup.js:281
msgid "Transaction has not been created"
msgstr "交易记录尚未创建。"
@@ -2928,7 +3046,7 @@ msgstr "交易记录尚未创建。"
msgid "Transaction initiated"
msgstr "交易发起"
-#: src/js/controllers/tx-details.js:102
+#: src/js/controllers/tx-details.js:119
msgid "Transaction not available at this time"
msgstr "交易记录暂时不可用"
@@ -2941,7 +3059,7 @@ msgstr "找不到交易"
msgid "Transactions without fee are not supported."
msgstr "不支持无率交易"
-#: src/js/controllers/paperWallet.js:110
+#: src/js/controllers/paperWallet.js:109
msgid "Transfer to"
msgstr "转账给"
@@ -2965,15 +3083,11 @@ msgstr "键入恢复短语 (通常 12 个字)"
msgid "Uh oh..."
msgstr "哦哦......"
-#: www/views/tx-details.html:100
+#: www/views/tx-details.html:102
msgid "Unconfirmed"
msgstr "未确认"
-#: www/views/preferencesUnit.html:4
-msgid "Unit"
-msgstr "单位"
-
-#: www/views/walletDetails.html:178
+#: www/views/walletDetails.html:190
msgid "Unsent transactions"
msgstr "未发送的交易"
@@ -2993,7 +3107,7 @@ msgstr "可用的更新"
msgid "Updating pending proposals. Please stand by"
msgstr "正在更新挂起的建议。请袖手旁观"
-#: www/views/walletDetails.html:210
+#: www/views/walletDetails.html:217
msgid "Updating transaction history. Please stand by."
msgstr "更新交易历史记录。请等待。"
@@ -3005,7 +3119,7 @@ msgstr "更新中… 请等待"
msgid "Urgent"
msgstr "非常快"
-#: www/views/advancedSettings.html:11
+#: www/views/advancedSettings.html:12
msgid "Use Unconfirmed Funds"
msgstr "使用未经确认的资金"
@@ -3035,7 +3149,7 @@ msgid "View Terms of Service"
msgstr "查看服务条款"
#: src/js/controllers/bitpayCard.js:122
-#: src/js/controllers/tx-details.js:174
+#: src/js/controllers/tx-details.js:191
msgid "View Transaction on Insight"
msgstr "查看交易记录的洞察"
@@ -3043,7 +3157,7 @@ msgstr "查看交易记录的洞察"
msgid "View Update"
msgstr "查看更新"
-#: www/views/tx-details.html:147
+#: www/views/tx-details.html:149
msgid "View on blockchain"
msgstr "在 blockchain 上查看"
@@ -3051,7 +3165,7 @@ msgstr "在 blockchain 上查看"
msgid "Visit mercadolivre.com.br →"
msgstr "访问 mercadolivre.com.br →"
-#: www/views/walletDetails.html:170
+#: www/views/walletDetails.html:182
msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet."
msgstr "警告︰此设备/钱包无法运行钥匙衍生。无法在此钱包上执行操作。"
@@ -3092,7 +3206,7 @@ msgstr "钱包地址"
msgid "Wallet Color"
msgstr "钱包颜色"
-#: www/views/preferencesInformation.html:23
+#: www/views/preferencesInformation.html:29
msgid "Wallet Configuration (m-n)"
msgstr "钱包配置 (m n)"
@@ -3100,7 +3214,7 @@ msgstr "钱包配置 (m n)"
msgid "Wallet Created"
msgstr "创建的钱包"
-#: www/views/preferencesInformation.html:17
+#: www/views/preferencesInformation.html:23
msgid "Wallet Id"
msgstr "钱包 Id"
@@ -3117,9 +3231,9 @@ msgstr "钱包总共进账"
msgid "Wallet Invitation"
msgstr "钱包邀请"
-#: www/views/join.html:57
-#: www/views/tab-create-personal.html:36
-#: www/views/tab-create-shared.html:65
+#: www/views/join.html:60
+#: www/views/tab-create-personal.html:38
+#: www/views/tab-create-shared.html:67
msgid "Wallet Key"
msgstr "钱包钥匙"
@@ -3131,13 +3245,13 @@ msgstr "钱包的名字"
msgid "Wallet Name (at creation)"
msgstr "钱包名称(在创建时)"
-#: www/views/preferencesInformation.html:29
+#: www/views/preferencesInformation.html:35
msgid "Wallet Network"
msgstr "钱包网"
-#: www/views/join.html:74
-#: www/views/tab-create-personal.html:48
-#: www/views/tab-create-shared.html:77
+#: www/views/join.html:77
+#: www/views/tab-create-personal.html:50
+#: www/views/tab-create-shared.html:79
msgid "Wallet Recovery Phrase"
msgstr "钱包恢复短语"
@@ -3146,7 +3260,7 @@ msgid "Wallet Recovery Phrase is invalid"
msgstr "无效的钱包恢复短语"
#: www/views/preferencesAdvanced.html:25
-#: www/views/tab-import-phrase.html:70
+#: www/views/tab-import-phrase.html:73
msgid "Wallet Service URL"
msgstr "钱包服务 URL"
@@ -3155,7 +3269,7 @@ msgid "Wallet Settings"
msgstr "钱包的设置"
#: www/views/tab-import-hardware.html:11
-#: www/views/tab-import-phrase.html:58
+#: www/views/tab-import-phrase.html:61
msgid "Wallet Type"
msgstr "钱包类型"
@@ -3163,7 +3277,7 @@ msgstr "钱包类型"
msgid "Wallet already exists"
msgstr "钱包已存在"
-#: src/js/services/profileService.js:498
+#: src/js/services/profileService.js:515
msgid "Wallet already in {{appName}}"
msgstr "已经在 {{appName}} 的钱包"
@@ -3197,7 +3311,7 @@ msgid "Wallet needs backup"
msgstr "钱包需要备份"
#: www/views/tab-receive.html:59
-#: www/views/walletDetails.html:156
+#: www/views/walletDetails.html:169
msgid "Wallet not backed up"
msgstr "未备份的钱包"
@@ -3205,6 +3319,7 @@ msgstr "未备份的钱包"
msgid "Wallet not found"
msgstr "找不到钱包"
+#: src/js/controllers/cashScan.js:65
#: src/js/controllers/tab-home.js:220
msgid "Wallet not registered"
msgstr "未注册的钱包"
@@ -3225,13 +3340,13 @@ msgstr "找不到 Wallet Service"
msgid "Wallets"
msgstr "钱包"
-#: www/views/tab-settings.html:102
+#: www/views/tab-settings.html:107
msgid "Wallets & Integrations"
msgstr "钱包 & 集成"
#: src/js/controllers/addressbookView.js:23
-#: src/js/controllers/modals/txpDetails.js:147
-#: src/js/controllers/modals/txpDetails.js:164
+#: src/js/controllers/modals/txpDetails.js:153
+#: src/js/controllers/modals/txpDetails.js:170
#: src/js/controllers/preferencesDelete.js:24
#: src/js/controllers/preferencesExternal.js:14
#: www/views/preferencesDeleteWallet.html:11
@@ -3294,7 +3409,7 @@ msgstr "你会愿意率 {{appName}} app store 中的吗?"
msgid "Would you like to receive push notifications about payments?"
msgstr "你想收到推式通知有关付款吗?"
-#: src/js/controllers/import.js:270
+#: src/js/controllers/import.js:287
msgid "Wrong number of recovery words:"
msgstr "恢复词句数不正确:"
@@ -3404,19 +3519,24 @@ msgstr "您的购买被添加到列表的挂起"
msgid "Your wallet is never saved to cloud storage or standard device backups."
msgstr "你的钱包是永远不会保存到云存储或标准设备备份。"
-#: src/js/services/walletService.js:1031
+#: src/js/services/walletService.js:1030
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:96
+#: www/views/tab-home.html:97
#: www/views/tab-receive.html:74
-#: www/views/walletDetails.html:138
-#: www/views/walletDetails.html:58
+#: www/views/walletDetails.html:131
+#: www/views/walletDetails.html:51
msgid "[Balance Hidden]"
msgstr "[隐藏余额]"
+#: www/views/walletDetails.html:141
+#: www/views/walletDetails.html:61
+msgid "[Scanning Funds]"
+msgstr ""
+
#: src/js/controllers/bitpayCardIntro.js:11
msgid "add your BitPay Visa card(s)"
msgstr "添加您的 BitPay 签证卡"
@@ -3425,7 +3545,7 @@ msgstr "添加您的 BitPay 签证卡"
msgid "locked by pending payments"
msgstr "被未决支付锁定"
-#: src/js/services/profileService.js:389
+#: src/js/services/profileService.js:402
msgid "me"
msgstr "我"
@@ -3437,25 +3557,11 @@ msgstr "name@example.com"
msgid "preparing..."
msgstr "准备中..."
-#: src/js/controllers/confirm.js:329
-#: src/js/controllers/modals/txpDetails.js:44
-msgid "to accept"
-msgstr "接受"
-
-#: src/js/controllers/confirm.js:327
-msgid "to pay"
-msgstr "付款"
-
-#: src/js/controllers/confirm.js:331
-#: src/js/controllers/modals/txpDetails.js:41
-msgid "to send"
-msgstr "发送"
-
-#: src/js/controllers/buyAmazon.js:238
+#: src/js/controllers/buyAmazon.js:239
msgid "{{amountStr}} for Amazon.com Gift Card"
msgstr "{{amountStr}} 为亚马逊礼品卡的"
-#: src/js/controllers/buyMercadoLibre.js:236
+#: src/js/controllers/buyMercadoLibre.js:237
msgid "{{amountStr}} for Mercado Livre Brazil Gift Card"
msgstr "梅尔卡多里弗巴西礼品卡 {{amountStr}}"
@@ -3463,7 +3569,7 @@ 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:358
+#: src/js/controllers/confirm.js:387
msgid "{{fee}} will be deducted for bitcoin networking fees."
msgstr "{{fee}} 将比特币网络费用中扣除。"
@@ -3471,12 +3577,13 @@ msgstr "{{fee}} 将比特币网络费用中扣除。"
msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount"
msgstr "发送量 {{tx.txp[wallet.id].feeRatePerStr}}"
-#: www/views/walletDetails.html:211
+#: www/views/walletDetails.html:218
msgid "{{updatingTxHistoryProgress}} transactions downloaded"
msgstr "下载的 {{updatingTxHistoryProgress}} 交易"
+#: www/views/cashScan.html:32
#: www/views/copayers.html:46
-#: www/views/includes/walletInfo.html:13
+#: www/views/includes/walletInfo.html:18
msgid "{{wallet.m}}-of-{{wallet.n}}"
msgstr "{{wallet.m}}{{wallet.n}}"