Merge branch 'wallet/sprint/18' into wallet/task/335
This commit is contained in:
Jean-Baptiste Dominguez
GitHub
commit
53c95b0413
38 changed files with 3973 additions and 258 deletions
|
|
@ -24,9 +24,9 @@
|
|||
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
|
||||
"pushSenderId": "1036948132229",
|
||||
"description": "A Secure Bitcoin Wallet",
|
||||
"version": "4.11.0",
|
||||
"androidVersion": "411000",
|
||||
"fullVersion": "4.11-rc1",
|
||||
"version": "4.12.0",
|
||||
"fullVersion": "4.12-rc1",
|
||||
"androidVersion": "412000",
|
||||
"_extraCSS": "",
|
||||
"_enabledExtensions": {
|
||||
"coinbase": false,
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@
|
|||
<plugin name="cordova-plugin-queries-schemes" spec="~0.1.5" />
|
||||
<plugin name="cordova-plugin-firebase" spec="https://github.com/arnesson/cordova-plugin-firebase.git" />
|
||||
<plugin name="cordova-plugin-wkwebview-inputfocusfix" spec="https://github.com/onderceylan/cordova-plugin-wkwebview-inputfocusfix.git" />
|
||||
<plugin name="cordova-plugin-nativeaudio" spec="^3.0.9" />
|
||||
<!-- Changes in error descriptions may break the use of cordova-plugin-secure-storage -->
|
||||
<plugin name="cordova-plugin-secure-storage" spec="2.6.8" />
|
||||
<!-- Supported Platforms -->
|
||||
|
|
|
|||
|
|
@ -84,11 +84,12 @@
|
|||
"load-grunt-tasks": "^3.5.0",
|
||||
"shelljs": "^0.3.0",
|
||||
"android-versions": "^1.2.1",
|
||||
"bitcoincashjs": "^0.1.7"
|
||||
"bitcoincashjs-fork": "^1.0.3"
|
||||
},
|
||||
"scripts": {
|
||||
"postinstall": "bower install",
|
||||
"start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0",
|
||||
"start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"",
|
||||
"start:ios": "npm run build:www && npm run build:ios && npm run open:ios",
|
||||
"start:android": "npm run build:www && npm run build:android && npm run run:android",
|
||||
"start:windows": "npm run build:www && npm run build:windows",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
var bitcoinCashJsModule = angular.module('bitcoinCashJsModule', []);
|
||||
var bchjs = require('../node_modules/bitcoincashjs');
|
||||
var bchjs = require('../node_modules/bitcoincashjs-fork');
|
||||
|
||||
bitcoinCashJsModule.constant('MODULE_VERSION', '1.0.0');
|
||||
|
||||
|
|
|
|||
3634
i18n/po/ca/template-ca.po
Normal file
3634
i18n/po/ca/template-ca.po
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Czech\n"
|
||||
"Language: cs\n"
|
||||
"PO-Revision-Date: 2018-05-08 00:44-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:46+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
@ -989,7 +989,7 @@ msgstr "Povolit push notifikace"
|
|||
|
||||
#: www/views/preferencesNotifications.html:33
|
||||
msgid "Enable sound"
|
||||
msgstr ""
|
||||
msgstr "Povolit zvuky"
|
||||
|
||||
#: www/views/tab-scan.html:18
|
||||
msgid "Enable the camera to get started."
|
||||
|
|
@ -1342,7 +1342,7 @@ msgstr "Začněte"
|
|||
|
||||
#: www/views/addressbook.html:20
|
||||
msgid "Get started by adding your first one."
|
||||
msgstr "Začněte přidáním své první."
|
||||
msgstr "Začněte přidáním prvního."
|
||||
|
||||
#: src/js/services/onGoingProcess.js:23
|
||||
msgid "Getting fee levels..."
|
||||
|
|
@ -1582,7 +1582,7 @@ msgstr "Nesprávná síťová adresa"
|
|||
#: src/js/controllers/confirm.js:306
|
||||
#: src/js/services/bwcError.js:44
|
||||
msgid "Insufficient confirmed funds"
|
||||
msgstr ""
|
||||
msgstr "Nedostatečné potvrzené prostředky"
|
||||
|
||||
#: src/js/controllers/topup.js:165
|
||||
#: src/js/controllers/topup.js:177
|
||||
|
|
@ -1709,7 +1709,7 @@ msgstr "Načítání informací o transakci..."
|
|||
|
||||
#: www/views/tab-settings.html:100
|
||||
msgid "Lock App"
|
||||
msgstr "Uzamknout aplikaci"
|
||||
msgstr "Uzamknutí aplikace"
|
||||
|
||||
#: src/js/controllers/lockSetup.js:23
|
||||
msgid "Lock by Fingerprint"
|
||||
|
|
@ -2049,7 +2049,7 @@ msgstr "Otevřít GitHub projekt"
|
|||
#: src/js/controllers/bitpayCard.js:123
|
||||
#: src/js/controllers/tx-details.js:192
|
||||
msgid "Open Explorer"
|
||||
msgstr ""
|
||||
msgstr "Otevřít Explorer"
|
||||
|
||||
#: www/views/tab-scan.html:22
|
||||
msgid "Open Settings"
|
||||
|
|
@ -2256,7 +2256,7 @@ msgstr "Stiskněte znovu pro ukončení"
|
|||
|
||||
#: src/js/services/feeService.js:11
|
||||
msgid "Priority"
|
||||
msgstr "Priorita"
|
||||
msgstr "Prioritní"
|
||||
|
||||
#: www/views/includes/incomingDataMenu.html:80
|
||||
msgid "Private Key"
|
||||
|
|
@ -3196,7 +3196,7 @@ msgstr "Zobrazit Podmínky použití"
|
|||
#: src/js/controllers/bitpayCard.js:122
|
||||
#: src/js/controllers/tx-details.js:191
|
||||
msgid "View Transaction on Explorer.Bitcoin.com"
|
||||
msgstr ""
|
||||
msgstr "Zobrazit transakci na Explorer.Bitcoin.com"
|
||||
|
||||
#: src/js/controllers/tab-home.js:148
|
||||
msgid "View Update"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: German\n"
|
||||
"Language: de\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:49+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
@ -32,7 +32,7 @@ msgstr "- {{btx.feeRateStr}}ของธุรกรรม"
|
|||
|
||||
#: www/views/modals/txp-details.html:102
|
||||
msgid "- {{tx.feeRateStr}} of the transaction"
|
||||
msgstr ""
|
||||
msgstr "- {{tx.feeRateStr}} der Transaktion"
|
||||
|
||||
#: www/views/feedback/rateApp.html:7
|
||||
msgid "5-star ratings help us get {{appName}} into more hands, and more users means more resources can be committed to the app!"
|
||||
|
|
@ -41,7 +41,7 @@ msgstr "Eine 5-Sterne Bewertung hilft uns, {{appName}} unter die Leute zu bringe
|
|||
#: www/views/mercadoLibre.html:18
|
||||
#: www/views/mercadoLibre.html:40
|
||||
msgid "<b>Only</b> redeemable on Mercado Livre (Brazil)"
|
||||
msgstr ""
|
||||
msgstr "<b>Nur</b> einlösbar auf Mercado Livre (Brasilien)"
|
||||
|
||||
#: src/js/controllers/feedback/send.js:27
|
||||
#: www/views/feedback/complete.html:21
|
||||
|
|
@ -124,7 +124,7 @@ msgstr "Ein optionales Passwort zur Sicherung der Wiederherstellungsphrase hinzu
|
|||
|
||||
#: www/views/includes/incomingDataMenu.html:41
|
||||
msgid "Add as a contact"
|
||||
msgstr ""
|
||||
msgstr "Als Kontakt hinzufügen"
|
||||
|
||||
#: src/js/controllers/confirm.js:424
|
||||
msgid "Add description"
|
||||
|
|
@ -132,11 +132,11 @@ msgstr "Beschreibung hinzufügen"
|
|||
|
||||
#: www/views/topup.html:6
|
||||
msgid "Add funds"
|
||||
msgstr ""
|
||||
msgstr "Guthaben aufladen"
|
||||
|
||||
#: src/js/services/bitpayAccountService.js:78
|
||||
msgid "Add this BitPay account ({{email}})?"
|
||||
msgstr ""
|
||||
msgstr "Dieses BitPay Konto hinzufügen ({{email}})?"
|
||||
|
||||
#: www/views/add.html:3
|
||||
msgid "Add wallet"
|
||||
|
|
@ -204,7 +204,7 @@ msgstr "Alternative Währung"
|
|||
|
||||
#: src/js/controllers/buyAmazon.js:98
|
||||
msgid "Amazon.com is not available at this moment. Please try back later."
|
||||
msgstr ""
|
||||
msgstr "Amazon.com ist zurzeit nicht verfügbar. Bitte versuchen Sie es später nochmal."
|
||||
|
||||
#: www/views/amount.html:44
|
||||
#: www/views/customAmount.html:34
|
||||
|
|
@ -222,7 +222,7 @@ msgstr "Betrag zu hoch"
|
|||
|
||||
#: www/views/includes/walletHistory.html:31
|
||||
msgid "Amount too low to spend"
|
||||
msgstr ""
|
||||
msgstr "Betrag ist zu niedrig zum ausgeben"
|
||||
|
||||
#: src/js/controllers/tab-home.js:147
|
||||
msgid "An update to this app is available. For your security, please update to the latest version."
|
||||
|
|
@ -359,12 +359,12 @@ msgstr "Bitcoin-Adresse"
|
|||
|
||||
#: www/views/cashScan.html:4
|
||||
msgid "Bitcoin Cash (BCH) Balances"
|
||||
msgstr ""
|
||||
msgstr "Bitcoin Cash (BCH) Guthaben"
|
||||
|
||||
#: www/views/preferencesCash.html:3
|
||||
#: www/views/tab-settings.html:47
|
||||
msgid "Bitcoin Cash Support"
|
||||
msgstr ""
|
||||
msgstr "Bitcoin Cash Support"
|
||||
|
||||
#: www/views/tab-home.html:98
|
||||
#: www/views/tab-settings.html:115
|
||||
|
|
@ -380,11 +380,11 @@ msgstr "Bitcoin-Netzwerk Gebührenübersicht"
|
|||
#: www/views/tab-home.html:83
|
||||
#: www/views/tab-settings.html:107
|
||||
msgid "Bitcoin Core Wallets"
|
||||
msgstr ""
|
||||
msgstr "Bitcoin Core Brieftaschen"
|
||||
|
||||
#: src/js/services/incomingData.js:151
|
||||
msgid "Bitcoin cash Payment"
|
||||
msgstr ""
|
||||
msgstr "Bitcoin Cash Zahlung"
|
||||
|
||||
#: www/views/onboarding/tour.html:31
|
||||
msgid "Bitcoin is a currency."
|
||||
|
|
@ -404,7 +404,7 @@ msgstr "Bitcoin Transaktionen enthalten eine Gebühr für die \"Miners\" im Netz
|
|||
|
||||
#: www/views/buyAmazon.html:108
|
||||
msgid "Bought {{amountUnitStr}}"
|
||||
msgstr ""
|
||||
msgstr "{{amountUnitStr}} erworben"
|
||||
|
||||
#: www/views/modals/txp-details.html:36
|
||||
msgid "Broadcast Payment"
|
||||
|
|
@ -474,7 +474,7 @@ msgstr "Abbruch"
|
|||
|
||||
#: www/views/copayers.html:36
|
||||
msgid "Cancel invitation"
|
||||
msgstr ""
|
||||
msgstr "Einladung zurückziehen"
|
||||
|
||||
#: src/js/controllers/onboarding/tour.js:52
|
||||
msgid "Cannot Create Wallet"
|
||||
|
|
@ -519,7 +519,7 @@ msgstr "Cache leeren"
|
|||
#: src/js/controllers/confirm.js:373
|
||||
#: src/js/controllers/modals/txpDetails.js:49
|
||||
msgid "Click to accept"
|
||||
msgstr ""
|
||||
msgstr "Klicken Sie zum Akzeptieren"
|
||||
|
||||
#: src/js/controllers/confirm.js:367
|
||||
msgid "Click to pay"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Spanish\n"
|
||||
"Language: es\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:57+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Persian\n"
|
||||
"Language: fa\n"
|
||||
"PO-Revision-Date: 2018-05-08 00:44-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:53+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
@ -989,7 +989,7 @@ msgstr "فعال کردن اعلان های با فرمت push"
|
|||
|
||||
#: www/views/preferencesNotifications.html:33
|
||||
msgid "Enable sound"
|
||||
msgstr ""
|
||||
msgstr "فعال کردن صدا"
|
||||
|
||||
#: www/views/tab-scan.html:18
|
||||
msgid "Enable the camera to get started."
|
||||
|
|
@ -1582,7 +1582,7 @@ msgstr "آدرس شبکه نادرست"
|
|||
#: src/js/controllers/confirm.js:306
|
||||
#: src/js/services/bwcError.js:44
|
||||
msgid "Insufficient confirmed funds"
|
||||
msgstr ""
|
||||
msgstr "موجودی تائید شذه ناکافی"
|
||||
|
||||
#: src/js/controllers/topup.js:165
|
||||
#: src/js/controllers/topup.js:177
|
||||
|
|
@ -2049,7 +2049,7 @@ msgstr "باز کردن پروژه GitHub"
|
|||
#: src/js/controllers/bitpayCard.js:123
|
||||
#: src/js/controllers/tx-details.js:192
|
||||
msgid "Open Explorer"
|
||||
msgstr ""
|
||||
msgstr "باز کردن مرورگر"
|
||||
|
||||
#: www/views/tab-scan.html:22
|
||||
msgid "Open Settings"
|
||||
|
|
@ -3196,7 +3196,7 @@ msgstr "مشاهده شرایط و ضوابط خدمات"
|
|||
#: src/js/controllers/bitpayCard.js:122
|
||||
#: src/js/controllers/tx-details.js:191
|
||||
msgid "View Transaction on Explorer.Bitcoin.com"
|
||||
msgstr ""
|
||||
msgstr "مشاهده تراکنش در Explorer.Bitcoin.com"
|
||||
|
||||
#: src/js/controllers/tab-home.js:148
|
||||
msgid "View Update"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: French\n"
|
||||
"Language: fr\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:48+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Italian\n"
|
||||
"Language: it\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:50+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Japanese\n"
|
||||
"Language: ja\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:51+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Korean\n"
|
||||
"Language: ko\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:52+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Dutch\n"
|
||||
"Language: nl\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:48+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Polish\n"
|
||||
"Language: pl\n"
|
||||
"PO-Revision-Date: 2018-05-08 00:44-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:54+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Portuguese, Brazilian\n"
|
||||
"Language: pt\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:55+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Swedish\n"
|
||||
"Language: sv\n"
|
||||
"PO-Revision-Date: 2018-05-08 00:44-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:58+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
@ -187,11 +187,11 @@ msgstr ""
|
|||
|
||||
#: www/views/tab-scan.html:21
|
||||
msgid "Allow Camera Access"
|
||||
msgstr ""
|
||||
msgstr "Tillåt kameraåtkomst"
|
||||
|
||||
#: www/views/onboarding/notifications.html:7
|
||||
msgid "Allow notifications"
|
||||
msgstr ""
|
||||
msgstr "Tillåt notificationer"
|
||||
|
||||
#: www/views/onboarding/disclaimer.html:14
|
||||
msgid "Almost done! Let's review."
|
||||
|
|
@ -200,149 +200,149 @@ msgstr ""
|
|||
#: www/views/preferencesAltCurrency.html:4
|
||||
#: www/views/tab-settings.html:79
|
||||
msgid "Alternative Currency"
|
||||
msgstr ""
|
||||
msgstr "Alternativ Valuta"
|
||||
|
||||
#: src/js/controllers/buyAmazon.js:98
|
||||
msgid "Amazon.com is not available at this moment. Please try back later."
|
||||
msgstr ""
|
||||
msgstr "Amazon.com är inte tillgängligt för tillfället. Försök igen senare."
|
||||
|
||||
#: www/views/amount.html:44
|
||||
#: www/views/customAmount.html:34
|
||||
#: www/views/includes/output.html:7
|
||||
msgid "Amount"
|
||||
msgstr ""
|
||||
msgstr "Belopp"
|
||||
|
||||
#: src/js/services/bwcError.js:110
|
||||
msgid "Amount below minimum allowed"
|
||||
msgstr ""
|
||||
msgstr "Belopp under minsta tillåtna"
|
||||
|
||||
#: src/js/controllers/confirm.js:216
|
||||
msgid "Amount too big"
|
||||
msgstr ""
|
||||
msgstr "Beloppet för stort"
|
||||
|
||||
#: www/views/includes/walletHistory.html:31
|
||||
msgid "Amount too low to spend"
|
||||
msgstr ""
|
||||
msgstr "Beloppet för lågt för att spendera"
|
||||
|
||||
#: src/js/controllers/tab-home.js:147
|
||||
msgid "An update to this app is available. For your security, please update to the latest version."
|
||||
msgstr ""
|
||||
msgstr "En uppdatering för appen är tillgänglig. För din säkerhet, var vänlig uppdatera till den senaste versionen."
|
||||
|
||||
#: www/views/backupWarning.html:14
|
||||
msgid "Anyone with your backup phrase can access or spend your bitcoin."
|
||||
msgstr ""
|
||||
msgstr "Vem som helst med din återhämtnings fras kan kommat åt eller spendera dina bitcoin."
|
||||
|
||||
#: www/views/addresses.html:94
|
||||
msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)"
|
||||
msgstr ""
|
||||
msgstr "Ungefärlig Bitcoin nätverks avgift för att överföra plånbokens saldo (med normal prioritet)"
|
||||
|
||||
#: www/views/backupWarning.html:10
|
||||
msgid "Are you being watched?"
|
||||
msgstr ""
|
||||
msgstr "Håller någon ögonen på dig?"
|
||||
|
||||
#: src/js/controllers/preferencesExternal.js:15
|
||||
msgid "Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin."
|
||||
msgstr ""
|
||||
msgstr "Håller någon ögonen på dig? Vem som helst med din återhämtnings fras kan kommat åt eller spendera dina bitcoin."
|
||||
|
||||
#: src/js/controllers/copayers.js:56
|
||||
msgid "Are you sure you want to cancel and delete this wallet?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill avbryta och ta bort denna plånboken?"
|
||||
|
||||
#: src/js/controllers/addressbookView.js:37
|
||||
msgid "Are you sure you want to delete this contact?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill ta bort denna kontakten?"
|
||||
|
||||
#: src/js/controllers/preferencesDelete.js:25
|
||||
msgid "Are you sure you want to delete this wallet?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill ta bort denna plånboken?"
|
||||
|
||||
#: src/js/controllers/modals/txpDetails.js:154
|
||||
msgid "Are you sure you want to reject this transaction?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill avvisa denna transaktion?"
|
||||
|
||||
#: src/js/controllers/modals/txpDetails.js:171
|
||||
msgid "Are you sure you want to remove this transaction?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill ta bort denna transaktion?"
|
||||
|
||||
#: src/js/controllers/onboarding/backupRequest.js:23
|
||||
msgid "Are you sure you want to skip it?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill hoppa över detta?"
|
||||
|
||||
#: www/views/modals/bitpay-card-confirmation.html:4
|
||||
msgid "Are you sure you would like to log out of your BitPay Card account?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill logga ut från ditt BitPay Card konto?"
|
||||
|
||||
#: src/js/controllers/preferencesBitpayCard.js:7
|
||||
#: src/js/controllers/preferencesBitpayServices.js:20
|
||||
msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill ta bort ditt BitPay Card ({{lastFourDigits}}) från denna enheten?"
|
||||
|
||||
#: www/views/includes/walletInfo.html:10
|
||||
msgid "Auditable"
|
||||
msgstr ""
|
||||
msgstr "Granskningsbar"
|
||||
|
||||
#: www/views/modals/wallet-balance.html:42
|
||||
msgid "Available"
|
||||
msgstr ""
|
||||
msgstr "Tillgänglig"
|
||||
|
||||
#: www/views/includes/available-balance.html:3
|
||||
msgid "Available Balance"
|
||||
msgstr ""
|
||||
msgstr "Tillgängligt Saldo"
|
||||
|
||||
#: www/views/modals/chooseFeeLevel.html:24
|
||||
#: www/views/preferencesFee.html:15
|
||||
msgid "Average confirmation time"
|
||||
msgstr ""
|
||||
msgstr "Genomsnittlig bekräftelsetid"
|
||||
|
||||
#: 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 ""
|
||||
msgstr "BIP32 sökväg för adress derivering"
|
||||
|
||||
#: www/views/cashScan.html:25
|
||||
msgid "BTC wallets"
|
||||
msgstr ""
|
||||
msgstr "BTC plånböcker"
|
||||
|
||||
#: www/views/preferences.html:34
|
||||
msgid "Backup"
|
||||
msgstr ""
|
||||
msgstr "Säkerhetskopiera"
|
||||
|
||||
#: www/views/includes/backupNeededPopup.html:7
|
||||
msgid "Backup Needed"
|
||||
msgstr ""
|
||||
msgstr "Säkerhetskopiering Behövs"
|
||||
|
||||
#: src/js/controllers/lockSetup.js:87
|
||||
msgid "Backup all livenet wallets before using this function"
|
||||
msgstr ""
|
||||
msgstr "Säkerhetskopiera alla livenet plånböcker innan du använder denna funktion"
|
||||
|
||||
#: src/js/controllers/cashScan.js:64
|
||||
#: www/views/includes/walletListSettings.html:12
|
||||
#: www/views/preferences.html:36
|
||||
msgid "Backup needed"
|
||||
msgstr ""
|
||||
msgstr "Säkerhetskopiering behövs"
|
||||
|
||||
#: www/views/includes/backupNeededPopup.html:9
|
||||
msgid "Backup now"
|
||||
msgstr ""
|
||||
msgstr "Säkerhetskopiera nu"
|
||||
|
||||
#: www/views/onboarding/backupRequest.html:11
|
||||
#: www/views/tab-export-file.html:89
|
||||
msgid "Backup wallet"
|
||||
msgstr ""
|
||||
msgstr "Säkerhetskopiera plånbok"
|
||||
|
||||
#: src/js/controllers/lockSetup.js:84
|
||||
msgid "Backup your wallet before using this function"
|
||||
msgstr ""
|
||||
msgstr "Säkerhetskopiera din plånbok innan du använder denna funktion"
|
||||
|
||||
#: src/js/services/profileService.js:446
|
||||
msgid "Bad wallet invitation"
|
||||
msgstr ""
|
||||
msgstr "Fel på plånboks inbjudan"
|
||||
|
||||
#: www/views/preferencesInformation.html:102
|
||||
msgid "Balance By Address"
|
||||
msgstr ""
|
||||
msgstr "Saldo av Address"
|
||||
|
||||
#: www/views/includes/confirmBackupPopup.html:7
|
||||
msgid "Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it."
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Vietnamese\n"
|
||||
"Language: vi\n"
|
||||
"PO-Revision-Date: 2018-05-15 20:18-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:59+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
@ -24,7 +24,7 @@ msgstr "(có thể chi tiêu gấp đôi)"
|
|||
|
||||
#: www/views/modals/txp-details.html:159
|
||||
msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
|
||||
msgstr ""
|
||||
msgstr "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created."
|
||||
|
||||
#: www/views/tx-details.html:82
|
||||
msgid "- {{btx.feeRateStr}} of the transaction"
|
||||
|
|
@ -41,16 +41,16 @@ msgstr "Xếp hạng 5 sao giúp chúng tôi để {{appName}} đến tay nhiề
|
|||
#: www/views/mercadoLibre.html:18
|
||||
#: www/views/mercadoLibre.html:40
|
||||
msgid "<b>Only</b> redeemable on Mercado Livre (Brazil)"
|
||||
msgstr ""
|
||||
msgstr "<b>Only</b> redeemable on Mercado Livre (Brazil)"
|
||||
|
||||
#: 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 ""
|
||||
msgstr "A member of the team will review your feedback as soon as possible."
|
||||
|
||||
#: src/js/controllers/confirm.js:401
|
||||
msgid "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
|
||||
msgstr ""
|
||||
msgstr "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded."
|
||||
|
||||
#: src/js/controllers/confirm.js:395
|
||||
msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided."
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Last-Translator: emilold\n"
|
||||
"Language-Team: Chinese Simplified\n"
|
||||
"Language: zh\n"
|
||||
"PO-Revision-Date: 2018-05-08 00:44-0400\n"
|
||||
"PO-Revision-Date: 2018-06-22T04:02:44+0000\n"
|
||||
|
||||
#: www/views/modals/paypro.html:34
|
||||
msgid "(Trusted)"
|
||||
|
|
|
|||
|
|
@ -104,12 +104,12 @@ angular.module('copayApp.controllers').controller('searchController', function($
|
|||
};
|
||||
|
||||
$scope.searchOnBlockchain = function(searchTerm) {
|
||||
const url = 'https://explorer.bitcoin.com/'+$scope.wallet.coin+'/search/' + searchTerm;
|
||||
const optIn = true;
|
||||
const title = null;
|
||||
const message = gettextCatalog.getString('Search on Explorer.Bitcoin.com');
|
||||
const okText = gettextCatalog.getString('Open Explorer');
|
||||
const cancelText = gettextCatalog.getString('Go Back');
|
||||
var url = 'https://explorer.bitcoin.com/'+$scope.wallet.coin+'/search/' + searchTerm;
|
||||
var optIn = true;
|
||||
var title = null;
|
||||
var message = gettextCatalog.getString('Search on Explorer.Bitcoin.com');
|
||||
var okText = gettextCatalog.getString('Open Explorer');
|
||||
var cancelText = gettextCatalog.getString('Go Back');
|
||||
externalLinkService.open(url, optIn, title, message, okText, cancelText);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,24 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
var currentAddressSocket = {};
|
||||
var paymentSubscriptionObj = { op:"addr_sub" }
|
||||
|
||||
var config;
|
||||
|
||||
var soundLoaded = false;
|
||||
var nativeAudioAvailable = (window.plugins && window.plugins.NativeAudio);
|
||||
|
||||
if (nativeAudioAvailable) {
|
||||
window.plugins.NativeAudio.preloadSimple('received', 'misc/coin_received.mp3', function (msg) {
|
||||
$log.debug('Receive sound loaded.');
|
||||
soundLoaded = true;
|
||||
}, function (error) {
|
||||
$log.debug('Error loading receive sound.');
|
||||
$log.debug(error);
|
||||
});
|
||||
} else {
|
||||
$log.debug('isNW: Using HTML5-Audio instead of native audio');
|
||||
soundLoaded = true;
|
||||
}
|
||||
|
||||
$scope.displayBalanceAsFiat = true;
|
||||
|
||||
$scope.requestSpecificAmount = function() {
|
||||
|
|
@ -129,6 +147,17 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
}
|
||||
$scope.paymentReceivedCoin = $scope.wallet.coin;
|
||||
$scope.$apply(function () {
|
||||
|
||||
if (config.soundsEnabled && soundLoaded) {
|
||||
$log.debug('Play sound.');
|
||||
if (nativeAudioAvailable) {
|
||||
window.plugins.NativeAudio.play('received');
|
||||
} else {
|
||||
new Audio('misc/coin_received.ogg').play(); // NW.js has no mp3 support
|
||||
}
|
||||
} else {
|
||||
$log.debug('Sound is disabled.');
|
||||
}
|
||||
$scope.showingPaymentReceived = true;
|
||||
});
|
||||
}
|
||||
|
|
@ -215,12 +244,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
})
|
||||
];
|
||||
|
||||
configService.whenAvailable(function(config) {
|
||||
$scope.displayBalanceAsFiat = config.wallet.settings.priceDisplay === 'fiat';
|
||||
configService.whenAvailable(function(_config) {
|
||||
$scope.displayBalanceAsFiat = _config.wallet.settings.priceDisplay === 'fiat';
|
||||
config = _config;
|
||||
});
|
||||
});
|
||||
|
||||
$scope.$on("$ionicView.enter", function(event, data) {
|
||||
$scope.showingPaymentReceived = false;
|
||||
$ionicNavBarDelegate.showBar(true);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1383,6 +1383,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
}
|
||||
|
||||
$rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
|
||||
if (document.body.classList.contains('keyboard-open')) {
|
||||
document.body.classList.remove('keyboard-open');
|
||||
$log.debug('Prevented keyboard open bug..');
|
||||
}
|
||||
|
||||
$log.debug('Route change from:', fromState.name || '-', ' to:', toState.name);
|
||||
$log.debug(' toParams:' + JSON.stringify(toParams || {}));
|
||||
$log.debug(' fromParams:' + JSON.stringify(fromParams || {}));
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
|||
enabled: false,
|
||||
},
|
||||
|
||||
soundsEnabled: false,
|
||||
soundsEnabled: true,
|
||||
|
||||
log: {
|
||||
filter: 'debug',
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ angular.module('copayApp.services')
|
|||
isoCode: 'en',
|
||||
rateCode: 'USD'
|
||||
}, {
|
||||
name: 'català',
|
||||
isoCode: 'ca',
|
||||
rateCode: 'EUR'
|
||||
},{
|
||||
name: 'Čeština',
|
||||
isoCode: 'cs',
|
||||
rateCode: 'EUR'
|
||||
|
|
@ -55,6 +59,10 @@ angular.module('copayApp.services')
|
|||
name: 'Português',
|
||||
isoCode: 'pt',
|
||||
rateCode: 'EUR'
|
||||
}, {
|
||||
name: 'русский язык',
|
||||
isoCode: 'ru',
|
||||
rateCode: 'RUB'
|
||||
}, {
|
||||
name: '한국어',
|
||||
isoCode: 'ko',
|
||||
|
|
|
|||
|
|
@ -1179,12 +1179,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
|
|||
|
||||
if (signedTxp.status == 'accepted') {
|
||||
ongoingProcess.set('broadcastingTx', true, customStatusHandler);
|
||||
function handleBroadcastTx(err, broadcastedTxp) {
|
||||
|
||||
var handleBroadcastTx = function(err, broadcastedTxp) {
|
||||
ongoingProcess.set('broadcastingTx', false, customStatusHandler);
|
||||
if (err) return cb(bwcError.msg(err));
|
||||
if (err) return cb(bwcError.msg(err));
|
||||
$rootScope.$emit('Local/TxAction', wallet.id);
|
||||
return cb(null, broadcastedTxp);
|
||||
}
|
||||
};
|
||||
|
||||
if (signedTxp.payProUrl && signedTxp.coin == 'bch') {
|
||||
payproService.broadcastBchTx(signedTxp, handleBroadcastTx);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
@import "icons";
|
||||
@import "buttons";
|
||||
@import "forms";
|
||||
@import "qr";
|
||||
@import "mixins/mixins";
|
||||
@import "views/views";
|
||||
@import "directives/directives";
|
||||
|
|
|
|||
20
src/sass/qr.scss
Normal file
20
src/sass/qr.scss
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
qrcode {
|
||||
&.qr-icon {
|
||||
&::before {
|
||||
content: "";
|
||||
background-size: 100% 100%;
|
||||
display: block;
|
||||
margin-left: calc(50% - 22px);
|
||||
margin-top: 88px;
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
position: absolute;
|
||||
}
|
||||
&--bch::before {
|
||||
background-image: url('../img/qr-overlay-bch.png');
|
||||
}
|
||||
&--btc::before {
|
||||
background-image: url('../img/qr-overlay-btc.png');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -86,6 +86,9 @@ slide-to-accept-success {
|
|||
transition: transform $duration ease, opacity $duration ease;
|
||||
transition-delay: 250ms;
|
||||
|
||||
margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */
|
||||
margin-bottom: env(safe-area-inset-bottom); /* iOS 11.2 */
|
||||
|
||||
&.reveal {
|
||||
-webkit-transform: translateY(0);
|
||||
transform: translateY(0);
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@ wallet-selector {
|
|||
font-weight: bold;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid #EFEFEF;
|
||||
.subtitle {
|
||||
color: $v-mid-gray;
|
||||
font-size: $font-size-small;
|
||||
font-weight: 300;
|
||||
}
|
||||
.wallet-coin-logo {
|
||||
vertical-align: middle;
|
||||
margin-right: 5px;
|
||||
|
|
|
|||
|
|
@ -43,6 +43,11 @@
|
|||
.icon {
|
||||
color: $v-mid-gray;
|
||||
}
|
||||
.subtitle {
|
||||
color: $v-mid-gray;
|
||||
font-size: $font-size-small;
|
||||
font-weight: 300;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
www/img/qr-overlay-bch.png
Normal file
BIN
www/img/qr-overlay-bch.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
BIN
www/img/qr-overlay-btc.png
Normal file
BIN
www/img/qr-overlay-btc.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
BIN
www/misc/coin_received.mp3
Normal file
BIN
www/misc/coin_received.mp3
Normal file
Binary file not shown.
BIN
www/misc/coin_received.ogg
Normal file
BIN
www/misc/coin_received.ogg
Normal file
Binary file not shown.
|
|
@ -8,8 +8,8 @@
|
|||
<div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
|
||||
|
||||
<div class="subheader" ng-if="walletsBch[0] && walletsBtc[0]">
|
||||
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22">
|
||||
<span translate>Bitcoin Cash (BCH)</span>
|
||||
<div translate>Bitcoin Cash (BCH)</div>
|
||||
<div translate class="subtitle">Instant transactions with low fees</div>
|
||||
</div>
|
||||
<a
|
||||
ng-repeat="wallet in walletsBch track by $index"
|
||||
|
|
@ -40,8 +40,8 @@
|
|||
</a>
|
||||
|
||||
<div class="subheader" ng-if="walletsBtc[0] && walletsBch[0]" translate>
|
||||
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
|
||||
<span translate>Bitcoin Core (BTC)</span>
|
||||
<div translate>Bitcoin Core (BTC)</div>
|
||||
<div translate class="subtitle">Slow transactions with high fees</div>
|
||||
</div>
|
||||
<a
|
||||
ng-repeat="wallet in walletsBtc track by $index"
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@
|
|||
|
||||
<div class="list card">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22">
|
||||
<span translate>Bitcoin Cash (BCH)</span>
|
||||
<div translate>Bitcoin Cash (BCH)</div>
|
||||
<div translate class="subtitle">Instant transactions with low fees</div>
|
||||
<a ui-sref="tabs.add({coin:'bch'})"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||
</div>
|
||||
<div>
|
||||
|
|
@ -72,8 +72,8 @@
|
|||
|
||||
<div class="list card">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
|
||||
<span translate>Bitcoin Core (BTC)</span>
|
||||
<div translate>Bitcoin Core (BTC)</div>
|
||||
<div translate class="subtitle">Slow transactions with high fees</div>
|
||||
<a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||
</div>
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
</button>
|
||||
</span>
|
||||
|
||||
<qrcode ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode>
|
||||
<qrcode class="qr-icon qr-icon--{{ wallet.coin }}" ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode>
|
||||
<div class="address-label">
|
||||
<span class="ellipsis">{{addr}}</span>
|
||||
<ion-spinner ng-show="!addr" class="spinner-dark" icon="crescent"></ion-spinner>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue