diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 2b1068ad4..c4b181208 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -169,9 +169,21 @@ msgid "Address Book" msgstr "" #: www/views/preferencesInformation.html:41 +#: www/views/tab-receive.html:73 msgid "Address Type" msgstr "" +#: www/views/tab-receive.html:76 +#: www/views/addresses.html:45 +msgid "Cash Address" +msgstr "" + +#: www/views/tab-receive.html:77 +#: www/views/addresses.html:46 +msgid "Legacy" +msgstr "" + + #: www/views/addresses.html:64 msgid "Addresses With Balance" msgstr "" @@ -466,6 +478,22 @@ msgstr "" msgid "Buy Bitcoin" msgstr "" +#: www/views/buyandsell.html:5 +msgid "Buy or Sell Bitcoin" +msgstr "" + +#: www/views/buyandsell.html:13 +msgid "Connect an Exchange" +msgstr "" + +#: www/views/buyandsell.html:14 +msgid "Buy or sell bitcoin directly from your wallet by connecting your exchange accounts." +msgstr "" + +#: src/js/services/buy-bitcoin-com.service.js:14 +msgid "Buy Bitcoin With Credit Card" +msgstr "" + #: www/views/mercadoLibre.html:22 #: www/views/mercadoLibre.html:50 msgid "Buy a Gift Card" @@ -567,6 +595,7 @@ msgstr "" #: www/views/modals/search.html:3 #: www/views/modals/wallet-balance.html:3 #: www/views/modals/wallets.html:5 +#: www/views/modals/txp-details.html:4 msgid "Close" msgstr "" @@ -870,6 +899,10 @@ msgstr "" msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet" msgstr "" +#: www/views/preferencesInformation.html:79 +msgid "Copayers" +msgstr "" + #: www/views/modals/txp-details.html:81 #: www/views/tx-details.html:60 msgid "Created by" @@ -1044,7 +1077,7 @@ msgid "Enter Two Factor for your BitPay account" msgstr "" #: www/views/amount.html:4 -msgid "Enter amount" +msgid "Enter Amount" msgstr "" #: www/views/modals/chooseFeeLevel.html:41 @@ -1208,6 +1241,14 @@ msgstr "" msgid "Expires" msgstr "" +#: www/views/modals/txp-details.html:65 +msgid "Display legacy address" +msgstr "" + +#: www/views/modals/txp-details.html:68 +msgid "Display new style address" +msgstr "" + #: www/views/preferencesAdvanced.html:21 msgid "Export Wallet" msgstr "" @@ -1221,6 +1262,11 @@ msgstr "" msgid "Export wallet" msgstr "" +#: www/views/preferencesBwsUrl.html:3 +#: www/views/preferencesBwsUrl.html:13 +msgid "Wallet Service URL" +msgstr "" + #: src/js/services/walletService.js:1174 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" @@ -1541,7 +1587,7 @@ msgid "If enabled, the Recent Transactions card - a list of transactions occurin msgstr "" #: www/views/advancedSettings.html:14 -msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays." +msgid "If enabled, wallets will also try to spend unconfirmed funds. Turning off this option may cause transaction delays." msgstr "" #: src/js/controllers/onboarding/backupRequest.js:18 @@ -3743,7 +3789,7 @@ msgid "{{amountStr}} for Mercado Livre Brazil Gift Card" msgstr "" #: www/views/preferencesBwsUrl.html:21 -msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." +msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and wallet synchronization. The default configuration points to https://bws.bitcoin.com (Bitcoin.com's public BWS instance)." msgstr "" #: src/js/controllers/confirm.js:408 diff --git a/src/js/routes.js b/src/js/routes.js index d2b78aac3..a712a01c1 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1207,7 +1207,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }); }) - .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buydotbitcoindotcomService, pushNotificationsService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) { + .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buyBitcoinComService, pushNotificationsService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) { $ionicPlatform.ready(function() { diff --git a/src/js/services/buy-bitcoin-com.service.js b/src/js/services/buy-bitcoin-com.service.js new file mode 100644 index 000000000..7638edddd --- /dev/null +++ b/src/js/services/buy-bitcoin-com.service.js @@ -0,0 +1,27 @@ +'use strict'; + +(function() { + + angular + .module('bitcoincom.services') + .factory('buyBitcoinComService', buyBitcoinComService); + + function buyBitcoinComService(buyAndSellService, gettextCatalog) { + var service = { + + // Functions + register: register + }; + + return service; + + function register() { + buyAndSellService.register({ + name: 'buydotbitcoindotcom', + logo: 'img/bitcoin-com-logo-grey.png', + location: gettextCatalog.getString('Buy Bitcoin With Credit Card'), + sref: 'tabs.buyandsell.bitcoindotcom' + }); + }; + } +})(); diff --git a/src/js/services/buydotbitcoindotcomService.js b/src/js/services/buydotbitcoindotcomService.js deleted file mode 100644 index 085c61285..000000000 --- a/src/js/services/buydotbitcoindotcomService.js +++ /dev/null @@ -1,24 +0,0 @@ -'use strict'; - -angular.module('copayApp.services').factory('buydotbitcoindotcomService', function($http, $log, $window, $filter, platformInfo, storageService, buyAndSellService, lodash, configService, txFormatService) { - var root = {}; - var credentials = {}; - var isCordova = platformInfo.isCordova; - - root.init = function(cb) { - - }; - - var register = function() { - - buyAndSellService.register({ - name: 'buydotbitcoindotcom', - logo: 'img/bitcoin-com-logo-grey.png', - location: 'Buy Bitcoin With Credit Card', - sref: 'tabs.buyandsell.bitcoindotcom' - }); - }; - - register(); - return root; -}); diff --git a/www/views/addresses.html b/www/views/addresses.html index f9e66f7b8..7e9d2ba88 100644 --- a/www/views/addresses.html +++ b/www/views/addresses.html @@ -39,11 +39,11 @@
- Address type + Address Type
diff --git a/www/views/buyandsell.html b/www/views/buyandsell.html index f18866aa5..9a1fb5538 100644 --- a/www/views/buyandsell.html +++ b/www/views/buyandsell.html @@ -2,7 +2,7 @@ - Buy or Sell Bitcoin + Buy or Sell Bitcoin
@@ -10,8 +10,8 @@ -
Connect an Exchange
-
Buy or sell bitcoin directly from your wallet by connecting your exchange accounts.
+
Connect an Exchange
+
Buy or sell bitcoin directly from your wallet by connecting your exchange accounts.
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index 2586e3f9b..3cd7c4949 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -1,6 +1,6 @@ -
diff --git a/www/views/preferencesBwsUrl.html b/www/views/preferencesBwsUrl.html index 2b3c593fa..ff945ac69 100644 --- a/www/views/preferencesBwsUrl.html +++ b/www/views/preferencesBwsUrl.html @@ -1,6 +1,6 @@ - Wallet Service URL + Wallet Service URL @@ -10,7 +10,7 @@
-
+
Copayers
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 07cad7f7e..9ebc19c52 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -73,8 +73,8 @@ Address Type: