From e6785335a9c4a1a0025bb0f6d726cc0cc0f97c51 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Sat, 4 Jul 2015 13:02:46 +0300 Subject: [PATCH 001/158] Addon support Addons are simple Angular modules with views, controllers, services etc. Addons can register themselves in Copay using pluginManagerProvider. It allows them to add extra items to the bottom menu and as well as extra tab-views: ```` addonManagerProvider.registerAddon({ menuItem: { 'title': 'Assets', 'icon': 'icon-pricetag', 'link': 'assets' }, view: { id: 'assets', 'class': 'assets', template: 'colored-coins/views/assets.html' } }); ```` Addons can consume core Copay services and listen for events to react on changes. For this very first addon system inplementation Copay emits additional BalanceUpdated event so that interested addons can react on new transactions (see plugin reference implementation below). As bottom menu can accomodate only 6 items without sacrificing usability, so it was reworked to have second layer of items. Now If menu has more than 6 items, toggle button will be added to the menu allowing to reveal extra items in a sliding panel. Bottom menu in this case will show only 5 items, the rest will be rendered on sliding panel. This changes addresses issue #2949 and reference implementation of addon could be found here: https://github.com/troggy/copay-colored-coins-plugin --- public/views/includes/menu-toggle.html | 5 +++++ public/views/includes/menu.html | 28 ++++++++++++++++++++++++-- public/views/walletHome.html | 3 +++ src/css/mobile.css | 14 +++++++++++++ src/js/app.js | 5 ++++- src/js/controllers/index.js | 9 +++++++-- src/js/directives/directives.js | 7 +++++++ src/js/services/addonManager.js | 26 ++++++++++++++++++++++++ src/js/services/pluginManager.js | 10 --------- 9 files changed, 92 insertions(+), 15 deletions(-) create mode 100644 public/views/includes/menu-toggle.html create mode 100644 src/js/services/addonManager.js delete mode 100644 src/js/services/pluginManager.js diff --git a/public/views/includes/menu-toggle.html b/public/views/includes/menu-toggle.html new file mode 100644 index 000000000..dcb1b5cff --- /dev/null +++ b/public/views/includes/menu-toggle.html @@ -0,0 +1,5 @@ +
+ + + +
diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index 5993029e8..451f67074 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -1,5 +1,21 @@ -
-
+
+
+ + +
+ {{item.title|translate}} +
+ +
+
+ +
+ + +
+ +
+
@@ -10,4 +26,12 @@
+ +
+ +
+ +
+ + diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 406b86608..da8da5591 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -505,6 +505,9 @@
+
+
+
diff --git a/src/css/mobile.css b/src/css/mobile.css index 8b0538674..9471f4215 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -151,6 +151,20 @@ _:-ms-fullscreen, :root .main { background: #2C3E50; } +.second-bottom-bar { + z-index: 6; +} + +.second-bottom-bar.animated.slideInRight, +.second-bottom-bar.animated.slideInLeft { + -webkit-animation-duration: 0.3s; + animation-duration: 0.3s; +} + +.menu-toggle { + padding-top: 1rem !important; +} + .amount { width: 100%; text-align: center; diff --git a/src/js/app.js b/src/js/app.js index cb2e8fb89..748099a7d 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -12,7 +12,8 @@ var modules = [ 'copayApp.filters', 'copayApp.services', 'copayApp.controllers', - 'copayApp.directives' + 'copayApp.directives', + 'copayApp.plugins' ]; var copayApp = window.copayApp = angular.module('copayApp', modules); @@ -21,3 +22,5 @@ angular.module('copayApp.filters', []); angular.module('copayApp.services', []); angular.module('copayApp.controllers', []); angular.module('copayApp.directives', []); +angular.module('copayApp.plugins', []); + diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index faf3a335c..857549eb5 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -34,6 +34,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r 'link': 'history' }]; + self.addonViews = addonManager.addonViews(); + self.menu = self.menu.concat(addonManager.addonMenuItems()); + self.menuItemSize = self.menu.length > 4 ? 2 : 3; + self.tab = 'walletHome'; self.availableLanguages = [{ @@ -274,6 +278,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.walletScanStatus = walletStatus.wallet.scanStatus; self.copayers = walletStatus.wallet.copayers; self.preferences = walletStatus.preferences; + $rootScope.$emit('Local/BalanceUpdated', walletStatus.balance); self.setBalance(walletStatus.balance); self.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) { return w.id != self.walletId; @@ -548,7 +553,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r } }); }, false); - chooser.click(); + chooser.click(); } function formatDate(date) { diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 69433e59b..5696fd116 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -296,4 +296,11 @@ angular.module('copayApp.directives') }); } }; + }) + .directive('menuToggle', function() { + return { + restrict: 'E', + replace: true, + templateUrl: 'views/includes/menu-toggle.html' + } }); diff --git a/src/js/services/addonManager.js b/src/js/services/addonManager.js new file mode 100644 index 000000000..6a3aba52d --- /dev/null +++ b/src/js/services/addonManager.js @@ -0,0 +1,26 @@ +'use strict'; + +angular.module('copayApp.services').provider('addonManager', function () { + var addonMenuItems = []; + var addonViews = []; + + this.registerAddon = function(addonSpec) { + addonMenuItems.push(addonSpec.menuItem); + addonViews.push(addonSpec.view); + }; + + this.$get = function() { + var manager = {}; + + manager.addonMenuItems = function() { + return addonMenuItems; + }; + + manager.addonViews = function() { + return addonViews; + }; + + return manager; + } + +}); diff --git a/src/js/services/pluginManager.js b/src/js/services/pluginManager.js deleted file mode 100644 index 76b6361e2..000000000 --- a/src/js/services/pluginManager.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -angular.module('copayApp.services').factory('pluginManager', function() { - var root = {}; - root.getInstance = function(config){ - return new copay.PluginManager(config); - }; - - return root; -}); From 9dfca68354588907965442b451b8f4c3e4afb190 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Fri, 10 Jul 2015 14:59:18 +0300 Subject: [PATCH 002/158] Rename module to copayApp.addons --- src/js/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index 748099a7d..7468ccbd9 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -13,7 +13,7 @@ var modules = [ 'copayApp.services', 'copayApp.controllers', 'copayApp.directives', - 'copayApp.plugins' + 'copayApp.addons' ]; var copayApp = window.copayApp = angular.module('copayApp', modules); @@ -22,5 +22,5 @@ angular.module('copayApp.filters', []); angular.module('copayApp.services', []); angular.module('copayApp.controllers', []); angular.module('copayApp.directives', []); -angular.module('copayApp.plugins', []); +angular.module('copayApp.addons', []); From a8b20d3e7dd90ad964fad4a9a26a7e0a3e59d5b5 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Mon, 13 Jul 2015 22:25:34 +0300 Subject: [PATCH 003/158] Clarify the purpose of BalanceUpdated event emission --- src/js/controllers/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 857549eb5..6de662943 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -278,11 +278,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.walletScanStatus = walletStatus.wallet.scanStatus; self.copayers = walletStatus.wallet.copayers; self.preferences = walletStatus.preferences; - $rootScope.$emit('Local/BalanceUpdated', walletStatus.balance); self.setBalance(walletStatus.balance); self.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) { return w.id != self.walletId; });; + + // Notify external addons or plugins + $rootScope.$emit('Local/BalanceUpdated', walletStatus.balance); + $rootScope.$apply(); }); }); From 2552a8661faac818cd2a0e3ccb5e64586104c07b Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 14 Jul 2015 16:00:51 -0300 Subject: [PATCH 004/158] Delete CONTRIBUTE.md --- CONTRIBUTE.md | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 CONTRIBUTE.md diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md deleted file mode 100644 index 4400c428f..000000000 --- a/CONTRIBUTE.md +++ /dev/null @@ -1,25 +0,0 @@ -# QA - Bug Reporting - -To provide the most helpful bug reports to our developers, ensure that each issue/report that you create contains the following information: - -- Brief description of the bug -- Steps to reproduce the bug -- Platform in which you are testing -- Screenshots if possible -- Expected behaviour - - -**For example:** - -``` -Description: The application fails at login. - -1) Launch the app `npm run start` -2) Click on "Join a Wallet" -3) Type an nonexistent username -4) The app stops working and throws an "Unhandled exception" error. - -Expected: The app should login and show the home screen without any error. - -Platform: Android 4.3, Android 4.4, iOS -``` From 3f61445d02e18a7c19b569cd87a180a2874547b0 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 14 Jul 2015 16:01:02 -0300 Subject: [PATCH 005/158] Delete CHANGES.md --- CHANGES.md | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 CHANGES.md diff --git a/CHANGES.md b/CHANGES.md deleted file mode 100644 index 696a9f691..000000000 --- a/CHANGES.md +++ /dev/null @@ -1,45 +0,0 @@ -CHANGES -======= - -v0.2.1 ------- - -New features ------------- - * Smart backup restore procedure: now it is possible to restore all wallet's fund with an old backup (thanks Ian for the feedback). - * Transaction proposals can now have a short note attached for reference (thanks Gentry for the feedback). - * New wallet settings: Bitcoin Unit, defaults to *bits* (thanks Eric for the suggestion) - * Backup is now auto generated on wallet completion (thanks Eric for the suggestion) - * A wallet now can be removed from a particular system from the UX. - * New address book shared between copayers. - -Security --------- - * Asymmetric encryption and signing using ECIES. Details at https://gist.github.com/ryanxcharles/c29fc94d31de7c8c89dc - * Default SSL connection to Insight and PeerJs servers - -Code quality ------------- - * Test coverage from 60.9% to 74% (1) (thanks Ryan for insisting on this) - * Mayor refactoring of Angular services (backupService, controllerUtils, wallet's Indexes handling, txProposal merge related functions, - * Add +30 karma tests for Angular controllers and services - * Unified js-beautifier format throw all the code - -Other ------ - * Backup to email have been removed - * Performance improvements when signing transactions - * Review of Copay 1-of-1 UX - * Minor UX and wording fixes (address list on receiving funds, notifications fixes, error handling on bad passwords, network timeouts, feedback at importing process, etc). - -Next steps ----------- - * Make Copay available in other platforms (update Gordon's Atom shell packages, Android bundle, Firefox / Chrome extensions). - * Implement Copay 2.0 design: http://invis.io/FWZGJWUS (please take a look at leave comments) - - -Please check https://github.com/bitpay/copay/wiki/Copay-Known-issues before using Copay. - - -(1) not including Karma tests, not included on Coveralls yet. - From b2a901c17f96dc8295ea035edd22cfe55c5f2335 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 14 Jul 2015 16:47:23 -0300 Subject: [PATCH 006/158] Adds txid to Note column --- src/js/controllers/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 9048332ca..8764f40d5 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -629,11 +629,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (!isNode) csvContent = 'data:text/csv;charset=utf-8,'; csvContent += 'Date,Destination,Note,Amount,Currency,Spot Value,Total Value,Tax Type,Category\n'; - var _amount; + var _amount, _note; var dataString; data.forEach(function(it, index) { _amount = (it.action == 'sent' ? '-' : '') + (it.amount * satToBtc).toFixed(8); - dataString = formatDate(it.time * 1000) + ',' + formatString(it.addressTo) + ',' + formatString(it.message) + ',' + _amount + ',BTC,,,,'; + _note = formatString((it.message ? 'Note: ' + it.message + ' - ' : '') + 'TxId: ' + it.txid); + dataString = formatDate(it.time * 1000) + ',' + formatString(it.addressTo) + ',' + _note + ',' + _amount + ',BTC,,,,'; csvContent += index < data.length ? dataString + "\n" : dataString; }); From 91b0bb285450cb40a53f89b33d647c27f720aea3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 14 Jul 2015 17:27:31 -0300 Subject: [PATCH 007/158] Show alias to notification after delete the wallet --- src/js/controllers/preferencesDelete.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index cfd6dfa39..17decc0f3 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -35,14 +35,14 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro var _deleteWallet = function() { var fc = profileService.focusedClient; var name = fc.credentials.walletName; - var walletName = (fc.alias||'') + ' [' + name + ']'; + var walletName = name + (fc.alias ? ' (' + fc.alias + ')' : '' ); var self = this; profileService.deleteWalletFC({}, function(err) { if (err) { self.error = err.message || err; } else { - notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: name})); + notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); } }); }; From 1224a9a5bc65bbc53cb284e8c46395351551b3d5 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 14 Jul 2015 17:29:56 -0300 Subject: [PATCH 008/158] fix disabling email --- src/js/controllers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 5787c5f81..fea1a13be 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -792,7 +792,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/EmailSettingUpdated', function(event, email, cb) { self.updateRemotePreferences({ preferences: { - email: email + email: email || null }, }, cb); }); From f0c5639febc6be2970d44360faa601d44e692276 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 14 Jul 2015 17:39:20 -0300 Subject: [PATCH 009/158] Standarization --- src/js/controllers/preferencesDelete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 17decc0f3..67176147a 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro var _deleteWallet = function() { var fc = profileService.focusedClient; var name = fc.credentials.walletName; - var walletName = name + (fc.alias ? ' (' + fc.alias + ')' : '' ); + var walletName = (fc.alias||'') + ' [' + name + ']'; var self = this; profileService.deleteWalletFC({}, function(err) { From 17d8bd8082ed9b5e36b6b897740a75225ab9b449 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 15 Jul 2015 10:08:40 -0300 Subject: [PATCH 010/158] handles invalid txs in history --- public/views/modals/tx-details.html | 10 +++++++++- public/views/walletHome.html | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 84b397cfd..60e731c61 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -14,9 +14,13 @@
-
+
+-{{btx.amountStr}} {{settings.unitName}}
+
+ - +
+
{{btx.alternativeAmount}} {{settings.alternativeIsoCode}}
@@ -36,6 +40,10 @@ +
  • + + This transaction becomed invalid. Possible due to a double spend attempt. +
  • Date: diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 083703f50..f4231eeec 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -454,14 +454,20 @@ ng-style="{'background-color':index.backgroundColor}" translate>Received Sent Moved + Invalid
    • + - + + (possible double spend) + + {{btx.amountStr}} {{home.getUnitName()}} +
    From d4e02b91ac261157ee9fc786f56fc6f218f3156c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 15 Jul 2015 11:04:15 -0300 Subject: [PATCH 011/158] Fixes copay logo on disclaimer for Android < 4.2 --- public/views/disclaimer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 03a987300..879d04da0 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -10,7 +10,7 @@

    Terms of Use - Copay + Copay

    From 4ac645ff3bd46e17c30f33bc54d30c32abf64614 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 15 Jul 2015 13:09:21 -0300 Subject: [PATCH 012/158] Fixes open modal for android < 4.3 --- src/css/mobile.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/css/mobile.css b/src/css/mobile.css index 8b0538674..decb87651 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -573,6 +573,7 @@ to prevent collapsing during animation*/ body.modal-open { position: fixed; overflow: hidden; + z-index: 1; } .reveal-modal { From c4640dfa56960a0cf6bf65da7a6335c85962f749 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 15 Jul 2015 16:15:05 -0300 Subject: [PATCH 013/158] message on bad qr scanning --- src/js/controllers/walletHome.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index a50009ff6..4ec2e9ea2 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -28,6 +28,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) { self.setForm(data); $rootScope.$emit('Local/SetTab', 'send'); + + var form = $scope.sendForm; + if (form.address.$invalid) { + self.resetForm(); + self.error = gettext('Could not recognize a valid Bitcoin QR Code'); + } }); var disablePaymentUriListener = $rootScope.$on('paymentUri', function(event, uri) { From bddfa5c4d90baed9f62543974650214eaddb3d35 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 15 Jul 2015 22:10:59 -0300 Subject: [PATCH 014/158] export backup without signing capabilities --- public/views/backup.html | 35 +++++++++++++++++++++++++++- public/views/modals/txp-details.html | 2 +- public/views/walletHome.html | 2 ++ src/js/controllers/backup.js | 32 ++++++++++++++++++++++--- src/js/controllers/index.js | 1 + src/js/controllers/walletHome.js | 15 ++++++++++++ src/js/services/backupService.js | 10 ++++---- 7 files changed, 88 insertions(+), 9 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index f28f43656..bb3dd6e69 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -8,7 +8,12 @@

    -
    +
    +
    + + Failed to create backup +
    +
    The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive. @@ -29,6 +34,31 @@ name="password" ng-model="backup.repeatpassword">
    + +
    + + + Show Advanced options + Hide Advanced options + + + +
    +
    +
    + +
    + +
    + A backup without the private key will allow to see wallet balance, transaction, create spend proposals, but will not be able to approve (sign) proposals. + +
    +
    + +
    + + +

    Copy backup to a safe place

    diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 4399d42eb..ca68517c7 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -102,7 +102,7 @@ Reject
    -
    +
    @@ -127,6 +128,7 @@

    Testnet + - No Private key
    diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 0aec01726..93234d824 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -11,7 +11,15 @@ angular.module('copayApp.controllers').controller('backupController', this.isEncrypted = fc.isPrivKeyEncrypted(); this.downloadWalletBackup = function() { - backupService.walletDownload(this.password, function() { + var self = this; + var opts = { + noSign: $scope.noSign, + }; + backupService.walletDownload(this.password, opts, function(err) { + if (err) { + self.error = true; + return ; + } $rootScope.$emit('Local/BackupDone'); notification.success(gettext('Backup created'), gettext('Encrypted backup file saved')); go.walletHome(); @@ -19,19 +27,32 @@ angular.module('copayApp.controllers').controller('backupController', }; this.getBackup = function() { - return backupService.walletExport(this.password); + var opts = { + noSign: $scope.noSign, + }; + + var ew = backupService.walletExport(this.password, opts); + if (!ew) { + this.error = true; + } else { + this.error = false; + } + return ew; }; this.viewWalletBackup = function() { var self = this; $timeout(function() { - self.backupWalletPlainText = self.getBackup(); + var ew = self.getBackup(); + if (!ew) return; + self.backupWalletPlainText = ew; $rootScope.$emit('Local/BackupDone'); }, 100); }; this.copyWalletBackup = function() { var ew = this.getBackup(); + if (!ew) return; window.cordova.plugins.clipboard.copy(ew); window.plugins.toast.showShortCenter('Copied to clipboard'); $rootScope.$emit('Local/BackupDone'); @@ -48,6 +69,11 @@ angular.module('copayApp.controllers').controller('backupController', name = fc.alias + ' [' + name + ']'; } var ew = this.getBackup(); + if (!ew) return; + + if( $scope.noSign) + name = name + '(No Private Key)'; + var properties = { subject: 'Copay Wallet Backup: ' + name, body: 'Here is the encrypted backup of the wallet ' + name + ': \n\n' + ew + '\n\n To import this backup, copy all text between {...}, including the symbols {}', diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index dbc4457b3..57bda66e1 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -106,6 +106,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.walletName = fc.credentials.walletName; self.walletId = fc.credentials.walletId; self.isComplete = fc.isComplete(); + self.canSign = fc.canSign(); self.txps = []; self.copayers = []; self.updateColor(); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 4ec2e9ea2..79a9db808 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -182,6 +182,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers $scope.copayerId = fc.credentials.copayerId; + $scope.canSign= fc.canSign(); $scope.loading = null; $scope.color = fc.backgroundColor; refreshUntilItChanges = false; @@ -229,6 +230,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.sign = function(txp) { var fc = profileService.focusedClient; + + if (!fc.canSign()) + return; + if (fc.isPrivKeyEncrypted()) { profileService.unlockFC(function(err) { if (err) { @@ -727,6 +732,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return self.setSendError(err); } + if (!fc.canSign()) { + $log.info('No signing proposal: No private key') + self.setOngoingProcess(); + self.resetForm(); + txStatus.notify(txp, function() { + return $scope.$emit('Local/TxProposalAction'); + }); + return; + } + self.signAndBroadcast(txp, function(err) { self.setOngoingProcess(); profileService.lockFC(); diff --git a/src/js/services/backupService.js b/src/js/services/backupService.js index 328e5fcd8..de47cf5a2 100644 --- a/src/js/services/backupService.js +++ b/src/js/services/backupService.js @@ -53,13 +53,14 @@ angular.module('copayApp.services') return cb(); }; - root.walletExport = function(password) { + root.walletExport = function(password, opts) { if (!password) { return null; } var fc = profileService.focusedClient; try { - var b = fc.export({}); + opts = opts || {}; + var b = fc.export(opts); var e = sjcl.encrypt(password, b, { iter: 10000 }); @@ -70,12 +71,13 @@ angular.module('copayApp.services') }; }; - root.walletDownload = function(password, cb) { + root.walletDownload = function(password, opts, cb) { var fc = profileService.focusedClient; - var ew = root.walletExport(password); + var ew = root.walletExport(password, opts); if (!ew) return cb('Could not create backup'); var walletName = (fc.alias || '') + (fc.alias ? '-' : '') + fc.credentials.walletName; + if (opts.noSign) walletName = walletName + '-noSign' var filename = walletName + '-Copaybackup.aes.json'; _download(ew, filename, cb) }; From 42dd516b608e24a80edf8a9424c6b6c465e6b21f Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 16 Jul 2015 11:43:26 -0300 Subject: [PATCH 015/158] fix notification --- src/js/services/txStatus.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js index 82ae358c4..51e46ebe5 100644 --- a/src/js/services/txStatus.js +++ b/src/js/services/txStatus.js @@ -7,6 +7,7 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, var fc = profileService.focusedClient; var status = txp.status; var type; + var INMEDIATE_SECS = 10; if (status == 'broadcasted') { type = 'broadcasted'; @@ -17,10 +18,15 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, copayerId: fc.credentials.copayerId }); - if (!action || (action.type == 'accept' && n == 1)) { + if (!action) { type = 'created'; } else if (action.type == 'accept') { - type = 'accepted'; + // created and accepted at the same time? + if ( n == 1 && action.createdOn - txp.createdOn < INMEDIATE_SECS ) { + type = 'created'; + } else { + type = 'accepted'; + } } else if (action.type == 'reject') { type = 'rejected'; } else { From 598af4f1661ef855bddfe338157afb2dc887f599 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Thu, 16 Jul 2015 19:08:27 +0300 Subject: [PATCH 016/158] Addons can use OngoingProcess indicator Make Copay to call ``setOngoingProcess`` when ``Addon/OngoingProcess`` event received. Addons may emit this event to display relevant process indication to user. Example: https://github.com/troggy/copay-colored-coins-plugin/blob/feature/transfer-asset/js/controllers/assets.js#L11 --- src/js/controllers/walletHome.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 79a9db808..cd6129406 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -69,6 +69,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; }); + var disableOngoingProcessListener = $rootScope.$on('Addon/OngoingProcess', function(e, name) { + self.setOngoingProcess(name); + }); + $scope.$on('$destroy', function() { disableAddrListener(); disableScannerListener(); @@ -76,6 +80,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi disableTabListener(); disableFocusListener(); disableResumeListener(); + disableOngoingProcessListener(); $rootScope.hideMenuBar = false; }); From 0dd571438505585ee27fbf026bf19e247833484f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 16 Jul 2015 15:30:46 -0300 Subject: [PATCH 017/158] Fixes pot file and updates es --- po/es.po | 62 +++++++++++++++++++++++----- po/template.pot | 42 +++++++++++++++++++ public/views/modals/tx-details.html | 2 +- public/views/modals/txp-details.html | 2 +- public/views/walletHome.html | 4 +- 5 files changed, 97 insertions(+), 15 deletions(-) diff --git a/po/es.po b/po/es.po index 6f2499a88..59bc2dc09 100644 --- a/po/es.po +++ b/po/es.po @@ -12,6 +12,10 @@ msgstr "" "X-Generator: Poedit 1.6.10\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(Posible doble gasto)" + #: public/views/modals/txp-details.html msgid "" "* A payment proposal can be deleted if 1) you are the creator, and no other " @@ -30,6 +34,16 @@ msgstr "" "* Usted puede instalar la copia de seguridad en otro dispositivo y usar el " "monedero al mismo tiempo en varios dispositivos." +#: public/views/backup.html +msgid "" +"A backup without the private key will allow to see wallet balance, " +"transaction, create spend proposals, but will not be able to approve (sign) " +"proposals." +msgstr "" +"Una copia de seguridad sin la clave privada permitirá ver el balance del " +"monedero, las transacciones, crear propuestas de gasto, pero no podrá " +"aprobar (firmar) propuestas." + #: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "Monedero multifirma de bitcoin" @@ -295,6 +309,10 @@ msgstr "No se pudo unir al monedero usando la clave privada ingresada" msgid "Could not join wallet:" msgstr "No se pudo unir al monedero:" +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "No se reconoció un código QR de Bitcoin válido" + #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" msgstr "" @@ -377,6 +395,14 @@ msgstr "Alemán" msgid "Disabled" msgstr "Deshabilitado" +#: public/views/backup.html +msgid "Do not include private key on backup" +msgstr "No incluir la clave privada en la copia de seguridad" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Descargar archivo CSV" + #: public/views/backup.html msgid "Download backup" msgstr "Descargar copia de seguridad" @@ -429,6 +455,10 @@ msgstr "Error al importar monedero: " msgid "Expires" msgstr "Expira" +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Falló al crear copia de seguridad" + #: src/js/controllers/importLegacy.js msgid "Failed to import wallets" msgstr "Falló al importar monederos" @@ -466,6 +496,10 @@ msgstr "Generar código QR" msgid "Generate new address" msgstr "Generar nueva dirección" +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Generando archivo .csv..." + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Obteniendo direcciones para el monedero {{selectedWalletName}} ..." @@ -482,7 +516,7 @@ msgstr "Volver" msgid "Have a Backup from Copay v0.9?" msgstr "¿Tiene una copia de seguridad de Copay v0.9?" -#: public/views/create.html public/views/join.html +#: public/views/backup.html public/views/create.html public/views/join.html msgid "Hide Advanced options" msgstr "Ocultar opciones avanzadas" @@ -530,6 +564,10 @@ msgstr "Importando monedero..." msgid "Importing..." msgstr "Importando..." +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Inválido" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonés" @@ -611,6 +649,10 @@ msgstr "Nueva Propuesta de Pago" msgid "No" msgstr "No" +#: public/views/walletHome.html +msgid "No Private key" +msgstr "Sin clave privada" + #: public/views/walletHome.html msgid "No transactions yet" msgstr "Sin transacciones todavía" @@ -936,7 +978,7 @@ msgstr "" msgid "Shared Wallet" msgstr "Monedero Compartido" -#: public/views/create.html public/views/join.html +#: public/views/backup.html public/views/create.html public/views/join.html msgid "Show Advanced options" msgstr "Mostrar opciones avanzadas" @@ -1104,6 +1146,13 @@ msgstr "No dispone de monederos para realizar este pago" msgid "There is an error in the form" msgstr "Hay un error en el formulario" +#: public/views/modals/tx-details.html +msgid "" +"This transaction becomed invalid. Possible due to a double spend attempt." +msgstr "" +"Esta transacción se ha invalidado. Posiblemente debido a un intento de doble " +"gasto." + #: public/views/walletHome.html msgid "" "This wallet is not registered at the given Bitcore Wallet Service (BWS). You " @@ -1575,9 +1624,6 @@ msgstr "" #~ msgid "Disclaimer" #~ msgstr "Renuncia" -#~ msgid "Download CSV file" -#~ msgstr "Descargar archivo CSV" - #~ msgid "Email" #~ msgstr "Correo electrónico" @@ -1671,9 +1717,6 @@ msgstr "" #~ msgid "Name:" #~ msgstr "Nombre:" -#~ msgid "Need to be careful with backups" -#~ msgstr "Necesita ser cuidadoso con las copias de seguridad" - #~ msgid "Needs Backup" #~ msgstr "Copia de Seguridad necesaria" @@ -2074,9 +2117,6 @@ msgstr "" #~ msgid "required" #~ msgstr "requerido" -#~ msgid "valid!" -#~ msgstr "¡válido!" - #~ msgid "yet to backup the wallet." #~ msgstr "deben hacer su copia de seguridad" diff --git a/po/template.pot b/po/template.pot index 4dbda9a80..076e6b6aa 100644 --- a/po/template.pot +++ b/po/template.pot @@ -4,6 +4,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id-Version: \n" +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "" + #: public/views/modals/txp-details.html 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 "" @@ -12,6 +16,10 @@ msgstr "" msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." msgstr "" +#: public/views/backup.html +msgid "A backup without the private key will allow to see wallet balance, transaction, create spend proposals, but will not be able to approve (sign) proposals." +msgstr "" + #: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "" @@ -264,6 +272,10 @@ msgstr "" msgid "Could not join wallet:" msgstr "" +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "" + #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" msgstr "" @@ -348,6 +360,14 @@ msgstr "" msgid "Disabled" msgstr "" +#: public/views/backup.html +msgid "Do not include private key on backup" +msgstr "" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "" + #: public/views/backup.html msgid "Download backup" msgstr "" @@ -401,6 +421,10 @@ msgstr "" msgid "Expires" msgstr "" +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "" + #: src/js/controllers/importLegacy.js msgid "Failed to import wallets" msgstr "" @@ -438,6 +462,10 @@ msgstr "" msgid "Generate new address" msgstr "" +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "" @@ -454,6 +482,7 @@ msgstr "" msgid "Have a Backup from Copay v0.9?" msgstr "" +#: public/views/backup.html #: public/views/create.html #: public/views/join.html msgid "Hide Advanced options" @@ -505,6 +534,10 @@ msgstr "" msgid "Importing..." msgstr "" +#: public/views/walletHome.html +msgid "Invalid" +msgstr "" + #: src/js/controllers/index.js msgid "Japanese" msgstr "" @@ -590,6 +623,10 @@ msgstr "" msgid "No" msgstr "" +#: public/views/walletHome.html +msgid "No Private key" +msgstr "" + #: public/views/walletHome.html msgid "No transactions yet" msgstr "" @@ -913,6 +950,7 @@ msgstr "" msgid "Shared Wallet" msgstr "" +#: public/views/backup.html #: public/views/create.html #: public/views/join.html msgid "Show Advanced options" @@ -986,6 +1024,10 @@ msgstr "" msgid "There is an error in the form" msgstr "" +#: public/views/modals/tx-details.html +msgid "This transaction becomed invalid. Possible due to a double spend attempt." +msgstr "" + #: public/views/walletHome.html msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." msgstr "" diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 60e731c61..3b8c66661 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -18,7 +18,7 @@ +-{{btx.amountStr}} {{settings.unitName}}
    - - + -
    diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index ca68517c7..debb853af 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -112,7 +112,7 @@
    -
    +
    Payment accepted... diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 57d989a55..a68d4fa86 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -119,7 +119,7 @@
    Multisignature wallet ({{index.m}} of {{index.n}}) - Testnet - - No Private key + - No Private key
    @@ -128,7 +128,7 @@

    Testnet - - No Private key + - No Private key
    From dcf89cc3820a0021004c521c61b7a518fea187bb Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 16 Jul 2015 16:02:19 -0300 Subject: [PATCH 018/158] Updates store information --- appstore_de => cordova/docs/appstore_de | 0 appstore_en => cordova/docs/appstore_en | 11 +++++++++-- appstore_es => cordova/docs/appstore_es | 11 +++++++++-- appstore_fr => cordova/docs/appstore_fr | 0 appstore_ja => cordova/docs/appstore_ja | 0 appstore_pt => cordova/docs/appstore_pt | 0 6 files changed, 18 insertions(+), 4 deletions(-) rename appstore_de => cordova/docs/appstore_de (100%) rename appstore_en => cordova/docs/appstore_en (88%) rename appstore_es => cordova/docs/appstore_es (86%) rename appstore_fr => cordova/docs/appstore_fr (100%) rename appstore_ja => cordova/docs/appstore_ja (100%) rename appstore_pt => cordova/docs/appstore_pt (100%) diff --git a/appstore_de b/cordova/docs/appstore_de similarity index 100% rename from appstore_de rename to cordova/docs/appstore_de diff --git a/appstore_en b/cordova/docs/appstore_en similarity index 88% rename from appstore_en rename to cordova/docs/appstore_en index deb67f576..7ba5ce474 100644 --- a/appstore_en +++ b/cordova/docs/appstore_en @@ -1,5 +1,5 @@ -------------------------------- -Google Play store description +Description -------------------------------- Secure bitcoin on your own terms with an open source, multisignature wallet from BitPay. Copay users can hold funds individually or share finances securely with other users with multisignature wallets, which prevent unauthorized payments by requiring multiple approvals. Here are some ways Copay can be used with others: @@ -26,7 +26,14 @@ Customizable wallet naming and background colors Copay is free and open source software run on non-proprietary servers, so there's no need to rely on any company for continuous support. Anyone can review or contribute to Copay's source code on GitHub (https://github.com/bitpay/copay). -------------------------------- -Google Play store Release Notes: "What's new" +Release Notes: "What's new" +-------------------------------- +v1.1.2 +-------------------------------- +* Make a backup without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) +* Handles better `invalid` transactions in History +* Exports .csv files with transaction ID +* Minor bug fixes -------------------------------- v1.1.0 -------------------------------- diff --git a/appstore_es b/cordova/docs/appstore_es similarity index 86% rename from appstore_es rename to cordova/docs/appstore_es index d3abac92c..819abc933 100644 --- a/appstore_es +++ b/cordova/docs/appstore_es @@ -1,5 +1,5 @@ -------------------------------- -Google Play store description +Descripción -------------------------------- Asegura tus bitcoin con tus propias reglas con el monedero de código abierto, multifirma de BitPay. @@ -27,7 +27,14 @@ Monederos con nombres y colores de fondo personalizables Copay es un software gratuito y de código abierto que funciona en servidores no-propietarios, por lo que no es necesario confiar en una empresa para soporte continuo. Cualquier persona puede revisar y contribuir al código fuente de Copay en GitHub (https://github.com/bitpay/copay). -------------------------------- -Google Play store Release Notes: "What's new" +Notas de lanzamiento: "Qué hay de nuevo" +-------------------------------- +v1.1.2 +-------------------------------- +* Copias de seguridad sin capacidad de firmar transacciones (más información https://github.com/bitpay/copay/pull/2998) +* Maneja mejor las transacciones no válidas +* Exporta archivos .csv con el ID de transacción +* Corrección de errores menores -------------------------------- v1.0.2 -------------------------------- diff --git a/appstore_fr b/cordova/docs/appstore_fr similarity index 100% rename from appstore_fr rename to cordova/docs/appstore_fr diff --git a/appstore_ja b/cordova/docs/appstore_ja similarity index 100% rename from appstore_ja rename to cordova/docs/appstore_ja diff --git a/appstore_pt b/cordova/docs/appstore_pt similarity index 100% rename from appstore_pt rename to cordova/docs/appstore_pt From 6a22d324fd2df76d9f01be101d7d3a5228c6c584 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 16 Jul 2015 16:18:03 -0300 Subject: [PATCH 019/158] Updates release notes --- cordova/docs/appstore_en | 7 +++++-- cordova/docs/appstore_es | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cordova/docs/appstore_en b/cordova/docs/appstore_en index 7ba5ce474..33944a636 100644 --- a/cordova/docs/appstore_en +++ b/cordova/docs/appstore_en @@ -30,9 +30,12 @@ Release Notes: "What's new" -------------------------------- v1.1.2 -------------------------------- -* Make a backup without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) -* Handles better `invalid` transactions in History +* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) +* Better refresh and sorting rules in transaction history +* Handles better `invalid` in transaction history +* Supports TX history in wallet with huge amount of transactions * Exports .csv files with transaction ID +* Better UTXOs selection polices * Minor bug fixes -------------------------------- v1.1.0 diff --git a/cordova/docs/appstore_es b/cordova/docs/appstore_es index 819abc933..5c4b46a38 100644 --- a/cordova/docs/appstore_es +++ b/cordova/docs/appstore_es @@ -32,8 +32,11 @@ Notas de lanzamiento: "Qué hay de nuevo" v1.1.2 -------------------------------- * Copias de seguridad sin capacidad de firmar transacciones (más información https://github.com/bitpay/copay/pull/2998) +* Mejor reglas de orden y actualización en la historia de transacción * Maneja mejor las transacciones no válidas +* Soporta Historial de TX en monederos con gran cantidad de transacciones * Exporta archivos .csv con el ID de transacción +* Mejor política de selección de UTXOs * Corrección de errores menores -------------------------------- v1.0.2 From 178a98647e4c5efc52833619f2f55b9be5a70f90 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 16 Jul 2015 16:50:10 -0300 Subject: [PATCH 020/158] Updates description --- cordova/docs/appstore_en | 2 +- cordova/docs/appstore_es | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cordova/docs/appstore_en b/cordova/docs/appstore_en index 33944a636..1123680b2 100644 --- a/cordova/docs/appstore_en +++ b/cordova/docs/appstore_en @@ -33,7 +33,7 @@ v1.1.2 * Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) * Better refresh and sorting rules in transaction history * Handles better `invalid` in transaction history -* Supports TX history in wallet with huge amount of transactions +* Supports TX history in wallet with huge number of transactions * Exports .csv files with transaction ID * Better UTXOs selection polices * Minor bug fixes diff --git a/cordova/docs/appstore_es b/cordova/docs/appstore_es index 5c4b46a38..f7970a260 100644 --- a/cordova/docs/appstore_es +++ b/cordova/docs/appstore_es @@ -34,7 +34,7 @@ v1.1.2 * Copias de seguridad sin capacidad de firmar transacciones (más información https://github.com/bitpay/copay/pull/2998) * Mejor reglas de orden y actualización en la historia de transacción * Maneja mejor las transacciones no válidas -* Soporta Historial de TX en monederos con gran cantidad de transacciones +* Soporta Historial de TX en monederos con gran número de transacciones * Exporta archivos .csv con el ID de transacción * Mejor política de selección de UTXOs * Corrección de errores menores From 16d6bb7c5c044696077d79de29f8101fce88657b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 16 Jul 2015 16:53:24 -0300 Subject: [PATCH 021/158] Updated --- cordova/docs/appstore_en | 4 ++-- cordova/docs/appstore_es | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cordova/docs/appstore_en b/cordova/docs/appstore_en index 1123680b2..33482b9ca 100644 --- a/cordova/docs/appstore_en +++ b/cordova/docs/appstore_en @@ -32,8 +32,8 @@ v1.1.2 -------------------------------- * Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) * Better refresh and sorting rules in transaction history -* Handles better `invalid` in transaction history -* Supports TX history in wallet with huge number of transactions +* Better handling of `invalid` transactions in history +* Better handling of wallets with 1K+ transactions in history * Exports .csv files with transaction ID * Better UTXOs selection polices * Minor bug fixes diff --git a/cordova/docs/appstore_es b/cordova/docs/appstore_es index f7970a260..332945d0b 100644 --- a/cordova/docs/appstore_es +++ b/cordova/docs/appstore_es @@ -33,8 +33,8 @@ v1.1.2 -------------------------------- * Copias de seguridad sin capacidad de firmar transacciones (más información https://github.com/bitpay/copay/pull/2998) * Mejor reglas de orden y actualización en la historia de transacción -* Maneja mejor las transacciones no válidas -* Soporta Historial de TX en monederos con gran número de transacciones +* Mejor manejo de transacciones no válidas +* Mejor manejo de monederos con 1K+ transacciones * Exporta archivos .csv con el ID de transacción * Mejor política de selección de UTXOs * Corrección de errores menores From 8bd38ad5419ffb8daadda791173d7c06626bb0a1 Mon Sep 17 00:00:00 2001 From: Kirvx Date: Fri, 17 Jul 2015 00:10:41 +0200 Subject: [PATCH 022/158] Update appstore_fr --- cordova/docs/appstore_fr | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cordova/docs/appstore_fr b/cordova/docs/appstore_fr index 25bef46da..bf4c4ef37 100644 --- a/cordova/docs/appstore_fr +++ b/cordova/docs/appstore_fr @@ -1,5 +1,5 @@ -------------------------------- -Google Play store description +Description -------------------------------- Sécurisez vos bitcoins selon vos conditions avec un portefeuille open source et multi-signatures par BitPay. Les utilisateurs de Copay peuvent détenir leurs fonds de manière individuelle, ou partager leurs finances de manière sécurisée avec les autres utilisateurs en utilisant des portefeuilles multi-signatures, ce qui empêche les paiements non autorisés en exigeant des approbations multiples. @@ -27,7 +27,17 @@ Nous avons développé les fonctionnalités suivantes dans cette version de Copa Copay est un logiciel gratuit et open source qui tourne sur des serveurs non-propriétaires, il n'y a donc pas besoin de compter sur une entreprise pour un support continuel. N'importe qui peut examiner ou contribuer au code source de Copay sur GitHub (https://github.com/bitpay/copay). -------------------------------- -Google Play store Release Notes: "What's new" +Release Notes: "What's new" +-------------------------------- +v1.1.2 +-------------------------------- +• Il est maintenant possible de faire des sauvegardes sans les capacités de signature (plus d'informations sur https://github.com/bitpay/copay/pull/2998) +• Meilleures règles d'actualisation et de tri dans l'historique des transactions +• Meilleure prise en charge des transactions 'invalides' dans l'historique +• Meilleure prise en charge des portefeuilles avec plus de 1000 transactions dans l'historique +• Exportez les fichiers .csv avec un ID de transaction +• Meilleures politiques de sélection des UTXO +• Corrections de bugs mineurs -------------------------------- v1.1.0 -------------------------------- From 494d90c48dd75c50dc95588a76637941a3345ce8 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Fri, 17 Jul 2015 22:21:27 +0900 Subject: [PATCH 023/158] Fixed Japanese and English --- po/ja.po | 50 +++++++++++++++++++++++++++-- po/template.pot | 6 ++-- public/views/backup.html | 4 +-- public/views/modals/tx-details.html | 2 +- 4 files changed, 54 insertions(+), 8 deletions(-) diff --git a/po/ja.po b/po/ja.po index b4c873b3f..536ff0299 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,6 +12,10 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.6.4\n" +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(二重払い可能性あり)" + #: public/views/modals/txp-details.html msgid "" "* A payment proposal can be deleted if 1) you are the creator, and no other " @@ -30,6 +34,15 @@ msgstr "" "* 安全にバックアップを別のデバイスにインポートして、同じウォレットを複数の端" "末でご利用いただけます。" +#: public/views/backup.html +msgid "" +"A backup without its private key will allow the user to see the wallet " +"balance, transactions, and create spend proposals. However, it will not be " +"able to approve (sign) proposals." +msgstr "" +"秘密鍵なしのバックアップでは、残高の確認、取引履歴の確認、送金の提案ができま" +"す。しかし、送金の提案を承諾 (署名) できません。" + #: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "マルチシグネチャビットコインウォレット" @@ -292,6 +305,10 @@ msgstr "指定された拡張秘密鍵で参加できませんでした。" msgid "Could not join wallet:" msgstr "ウォレットに参加できませんでした。" +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "有効なビットコインQRコードが認識できませんでした。" + #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" msgstr "送金の提案を却下できませんでした。接続を確認し、やり直して下さい。" @@ -373,6 +390,14 @@ msgstr "ドイツ語" msgid "Disabled" msgstr "無効" +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "バックアップに秘密鍵を含めない" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "CSVファイルをダウンロード" + #: public/views/backup.html msgid "Download backup" msgstr "バックアップをダウンロード" @@ -425,6 +450,10 @@ msgstr "ウォレットインポート時にエラー" msgid "Expires" msgstr "有効期限：" +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "バックアップに失敗しました。" + #: src/js/controllers/importLegacy.js msgid "Failed to import wallets" msgstr "ウォレットのインポート失敗しました" @@ -462,6 +491,10 @@ msgstr "QRコードを生成" msgid "Generate new address" msgstr "新規アドレスを生成" +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "CSVファイル作成中…" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "「{{selectedWalletName}}」のアドレスを取得中…" @@ -478,7 +511,7 @@ msgstr "前に戻る" msgid "Have a Backup from Copay v0.9?" msgstr "Copay v0.9 のバックアップをお持ちですか？" -#: public/views/create.html public/views/join.html +#: public/views/backup.html public/views/create.html public/views/join.html msgid "Hide Advanced options" msgstr "詳細設定　非表示" @@ -526,6 +559,10 @@ msgstr "ウォレットインポート中…" msgid "Importing..." msgstr "インポート中…" +#: public/views/walletHome.html +msgid "Invalid" +msgstr "無効" + #: src/js/controllers/index.js msgid "Japanese" msgstr "日本語" @@ -607,6 +644,10 @@ msgstr "新しい送金の提案" msgid "No" msgstr "いいえ" +#: public/views/walletHome.html +msgid "No Private key" +msgstr "秘密鍵なし" + #: public/views/walletHome.html msgid "No transactions yet" msgstr "取引がありません" @@ -936,7 +977,7 @@ msgstr "" msgid "Shared Wallet" msgstr "共有ウォレットに参加" -#: public/views/create.html public/views/join.html +#: public/views/backup.html public/views/create.html public/views/join.html msgid "Show Advanced options" msgstr "詳細設定　表示" @@ -1098,6 +1139,11 @@ msgstr "送金可能なウォレットがありません" msgid "There is an error in the form" msgstr "フォームにエラーがありました" +#: public/views/modals/tx-details.html +msgid "" +"This transaction has become invalid; possibly due to a double spend attempt." +msgstr "この取引が無効になりました。二重払いの可能性があります。" + #: public/views/walletHome.html msgid "" "This wallet is not registered at the given Bitcore Wallet Service (BWS). You " diff --git a/po/template.pot b/po/template.pot index 076e6b6aa..493cdeae7 100644 --- a/po/template.pot +++ b/po/template.pot @@ -17,7 +17,7 @@ msgid "* You can safely install your backup on another device and use your walle msgstr "" #: public/views/backup.html -msgid "A backup without the private key will allow to see wallet balance, transaction, create spend proposals, but will not be able to approve (sign) proposals." +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." msgstr "" #: public/views/splash.html @@ -361,7 +361,7 @@ msgid "Disabled" msgstr "" #: public/views/backup.html -msgid "Do not include private key on backup" +msgid "Do not include private key in backup" msgstr "" #: public/views/walletHome.html @@ -1025,7 +1025,7 @@ msgid "There is an error in the form" msgstr "" #: public/views/modals/tx-details.html -msgid "This transaction becomed invalid. Possible due to a double spend attempt." +msgid "This transaction has become invalid; possibly due to a double spend attempt." msgstr "" #: public/views/walletHome.html diff --git a/public/views/backup.html b/public/views/backup.html index bb3dd6e69..6d1f340ff 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -47,13 +47,13 @@
    - A backup without the private key will allow to see wallet balance, transaction, create spend proposals, but will not be able to approve (sign) proposals. + A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals.
    diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 3b8c66661..7127f0360 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -42,7 +42,7 @@
  • - This transaction becomed invalid. Possible due to a double spend attempt. + This transaction has become invalid; possibly due to a double spend attempt.
  • Date: From ca009dbf9042e27960e78342b7e4c16e18395785 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 17 Jul 2015 10:55:00 -0300 Subject: [PATCH 024/158] Removes unused file --- public/views/history.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/views/history.html diff --git a/public/views/history.html b/public/views/history.html deleted file mode 100644 index e69de29bb..000000000 From 9f3a0dd781b3e972a55a2946ce095bbd48b7fca2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 17 Jul 2015 10:55:23 -0300 Subject: [PATCH 025/158] Updates es.po --- po/es.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/es.po b/po/es.po index 59bc2dc09..38c3a13ca 100644 --- a/po/es.po +++ b/po/es.po @@ -36,13 +36,13 @@ msgstr "" #: public/views/backup.html msgid "" -"A backup without the private key will allow to see wallet balance, " -"transaction, create spend proposals, but will not be able to approve (sign) " -"proposals." +"A backup without its private key will allow the user to see the wallet " +"balance, transactions, and create spend proposals. However, it will not be " +"able to approve (sign) proposals." msgstr "" -"Una copia de seguridad sin la clave privada permitirá ver el balance del " -"monedero, las transacciones, crear propuestas de gasto, pero no podrá " -"aprobar (firmar) propuestas." +"Una copia de seguridad sin la clave privada permitirá al usuario ver el " +"balance del monedero, las transacciones y crear propuestas de gasto. Sin " +"embargo, no podrá aprobar (firmar) propuestas." #: public/views/splash.html msgid "A multisignature bitcoin wallet" @@ -396,7 +396,7 @@ msgid "Disabled" msgstr "Deshabilitado" #: public/views/backup.html -msgid "Do not include private key on backup" +msgid "Do not include private key in backup" msgstr "No incluir la clave privada en la copia de seguridad" #: public/views/walletHome.html @@ -1148,9 +1148,9 @@ msgstr "Hay un error en el formulario" #: public/views/modals/tx-details.html msgid "" -"This transaction becomed invalid. Possible due to a double spend attempt." +"This transaction has become invalid; possibly due to a double spend attempt." msgstr "" -"Esta transacción se ha invalidado. Posiblemente debido a un intento de doble " +"Esta transacción se ha invalidado; posiblemente debido a un intento de doble " "gasto." #: public/views/walletHome.html From 43b2aae2c7e208a2f8e1eb13db26961a271d8bab Mon Sep 17 00:00:00 2001 From: Kirvx Date: Fri, 17 Jul 2015 15:55:43 +0200 Subject: [PATCH 026/158] Update fr.po --- po/fr.po | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/po/fr.po b/po/fr.po index 94a104e5d..65aefd086 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,6 +12,10 @@ msgstr "" "Language: fr\n" "X-Generator: Poedit 1.6.10\n" +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(double dépense éventuelle)" + #: public/views/modals/txp-details.html msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." msgstr " Une proposition de transaction peut être supprimée si 1) vous êtes le créateur, et aucun des autres copayers n'a signé, ou 2) 24 heures sont passées depuis la création de la proposition." @@ -20,6 +24,10 @@ msgstr " Une proposition de transaction peut être supprimée si 1) vous êtes msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." msgstr "Vous pouvez installer en toute sécurité votre sauvegarde sur un autre appareil et utiliser votre portefeuille depuis plusieurs appareils en même temps." +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "Une sauvegarde ne disposant pas de sa clé privée autorisera l'utilisateur à voir le solde du portefeuille, les transactions, et à créer des propositions de dépense. Cependant, il ne pourra pas approuver (signer) les propositions." + #: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "Un portefeuille bitcoin multi-signatures" @@ -272,6 +280,10 @@ msgstr "" msgid "Could not join wallet:" msgstr "Impossible de rejoindre le portefeuille" +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Impossible de reconnaître un code QR Bitcoin valide" + #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" msgstr "Impossible de rejeter le paiement. Vérifiez votre connexion internet réessayez" @@ -356,6 +368,14 @@ msgstr "Allemand" msgid "Disabled" msgstr "Désactivé" +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Ne pas inclure la clé privée dans la sauvegarde" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Télécharger le fichier CSV" + #: public/views/backup.html msgid "Download backup" msgstr "Télécharger la sauvegarde" @@ -409,6 +429,10 @@ msgstr "Erreur d'importation du portefeuille :" msgid "Expires" msgstr "Expire" +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Impossible de créer la sauvegarde" + #: src/js/controllers/importLegacy.js msgid "Failed to import wallets" msgstr "Impossible d'importer les portefeuilles" @@ -446,6 +470,10 @@ msgstr "Générer un code QR" msgid "Generate new address" msgstr "Générer une nouvelle adresse" +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Génération du fichier .csv..." + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Obtention d'une adresse pour le portefeuille {{selectedWalletName}} ..." @@ -464,6 +492,7 @@ msgstr "Vous avez une sauvegarde de Copay v0.9 ?" #: public/views/create.html #: public/views/join.html +#: public/views/backup.html msgid "Hide Advanced options" msgstr "Masquer les options avancées" @@ -513,6 +542,10 @@ msgstr "Importation du portefeuille..." msgid "Importing..." msgstr "Importation..." +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Invalide" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonais" @@ -595,6 +628,10 @@ msgstr "Nouvelle proposition de paiement" msgid "No" msgstr "Non" +#: public/views/walletHome.html +msgid "No Private key" +msgstr "Aucune clé privée" + #: public/views/walletHome.html msgid "No transactions yet" msgstr "Aucune transaction" @@ -918,6 +955,7 @@ msgstr "Partagez cette adresse de portefeuille pour recevoir des paiements. Pour msgid "Shared Wallet" msgstr "Portefeuille partagé" +#: public/views/backup.html #: public/views/create.html #: public/views/join.html msgid "Show Advanced options" @@ -991,6 +1029,10 @@ msgstr "Il n'y a pas de portefeuilles pour faire ce paiement" msgid "There is an error in the form" msgstr "Il y a une erreur dans la forme" +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "Cette transaction est devenue invalide ; il s'agit peut-être d'une tentative de double dépense." + #: public/views/walletHome.html 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).Vous pouvez le recréer depuis l'information locale." From fffc995c7f46127b6873d37fc22f8a785842d558 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 17 Jul 2015 10:56:27 -0300 Subject: [PATCH 027/158] Fixes backup page layout --- public/views/backup.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index 6d1f340ff..d3cb3387b 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -7,14 +7,14 @@
    -
    +
    -
    +
    Failed to create backup
    -
    +
    The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive. @@ -59,23 +59,23 @@
    - -

    Backup options

    - - @@ -83,9 +83,7 @@
    - - -
    +

    Copy backup to a safe place

    @@ -98,8 +96,11 @@
    -
    - * You can safely install your backup on another device and use your wallet from multiple devices at the same time. +
    +
    + * You can safely install your backup on another device and use your wallet from multiple devices at the same time. +
    +
    From 160f74bc8943116668d68a20920bad71387b6ec7 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 17 Jul 2015 11:10:16 -0300 Subject: [PATCH 028/158] New release v1.1.2 --- cordova/config.xml | 6 +++--- cordova/ios/Copay-Info.plist | 4 ++-- cordova/wp/Package.appxmanifest | 2 +- package.json | 2 +- webkitbuilds/setup-win32.iss | 2 +- webkitbuilds/setup-win64.iss | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cordova/config.xml b/cordova/config.xml index 40e873480..7e2d0f1e4 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.1.2" + android-versionCode="39" + ios-CFBundleVersion="1.1.2"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 76ff152b7..8b6a16678 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? CFBundleVersion - 1.1.1 + 1.1.2 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index 1c41b0ece..ebb44af4a 100644 --- a/cordova/wp/Package.appxmanifest +++ b/cordova/wp/Package.appxmanifest @@ -1,6 +1,6 @@  - + Copay Wallet diff --git a/package.json b/package.json index 001cd1c24..56cd14751 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.1.1", + "version": "1.1.2", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/setup-win32.iss b/webkitbuilds/setup-win32.iss index e08abcde4..1cc2132ff 100755 --- a/webkitbuilds/setup-win32.iss +++ b/webkitbuilds/setup-win32.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.1.1" +#define MyAppVersion "1.1.2" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" diff --git a/webkitbuilds/setup-win64.iss b/webkitbuilds/setup-win64.iss index f6e4ddd1f..1cac9d798 100755 --- a/webkitbuilds/setup-win64.iss +++ b/webkitbuilds/setup-win64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.1.1" +#define MyAppVersion "1.1.2" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" From 02d2aa5d440bc674a1bdbf0f57d59bee09bf6530 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Fri, 17 Jul 2015 23:16:28 +0900 Subject: [PATCH 029/158] Fix Japanese store update --- cordova/docs/appstore_ja | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cordova/docs/appstore_ja b/cordova/docs/appstore_ja index 992159111..116dc51eb 100644 --- a/cordova/docs/appstore_ja +++ b/cordova/docs/appstore_ja @@ -1,5 +1,5 @@ -------------------------------- -Google Play store description +Description -------------------------------- ビットコインにおける高度なセキュリティーを手軽に扱えるオープンソースマルチシグネチャウォレットです。 Copayは個人のご利用はもちろんのこと、複数人によるウォレット管理の権限分散も簡単なウォレットソフトを通してご活用いただけます。 @@ -27,7 +27,17 @@ Copayは個人のご利用はもちろんのこと、複数人によるウォレ Copayは永久無料でオープンソースのソフトです。サーバーもオープンソースなので、独自運用や法人の利用やソース流用は許可します。ソースをご覧の際に間違いなどが見つかった場合、Githubにてご報告・ソース修正のプルリクエストなどをお願いします。(https://github.com/bitpay/copay) -------------------------------- -Google Play store Release Notes: "What's new" +Release Notes: "What's new" +-------------------------------- +v1.1.2 +-------------------------------- +■ 署名のできない、送金の提案のみできる閲覧専用のバックアップが作成できます。(詳細 https://github.com/bitpay/copay/pull/2998) +■ 取引履歴のソートとページ更新の品質向上 +■ 「無効」な取引の処理改善 +■ 1000個以上の取引履歴のあるウォレットの処理改善 +■ 取引のCSV出力可能 +■ 未使用出力(utxo)の選択ロジックの改善 +■ バグの修正 -------------------------------- v1.1.0 -------------------------------- From 73f7d9a22b6de4e85ce6e4f671b372146ebef93c Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 17 Jul 2015 14:30:55 -0300 Subject: [PATCH 030/158] add fee to tx history --- public/views/modals/tx-details.html | 4 ++++ src/js/controllers/index.js | 4 ++++ src/js/controllers/walletHome.js | 1 + 3 files changed, 9 insertions(+) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 7127f0360..459d6601e 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -50,6 +50,10 @@
    • +
  • + Fee: + {{feeStr}} +
  • Note: diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 845e78dd2..b737b38fb 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -442,6 +442,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; self.setTxHistory = function(txs) { + var config = configService.getSync().wallet.settings; var now = Math.floor(Date.now() / 1000); var c = 0; self.txHistoryPaging = txs[self.limitHistory] ? true : false; @@ -453,6 +454,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r tx.rateTs = Math.floor((tx.ts || now) / 1000); tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')( + if (tx.fees) + tx.feeStr = profileService.formatAmount(tx.fees) + ' ' + config.unitName; + if (c < self.limitHistory) { self.txHistory.push(tx); c++; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index cd6129406..4ada49f85 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -994,6 +994,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.color = fc.backgroundColor; $scope.copayerId = fc.credentials.copayerId; $scope.isShared = fc.credentials.n > 1; + $scope.feeStr = btx.feeStr; $scope.getAmount = function(amount) { return self.getAmount(amount); From 4fa62b0e4e47729ff323aee36c0e2a56ccfd99de Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 17 Jul 2015 14:43:40 -0300 Subject: [PATCH 031/158] handle moved + fee --- src/js/controllers/index.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index b737b38fb..dc6d91985 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -645,8 +645,20 @@ angular.module('copayApp.controllers').controller('indexController', function($r var _amount, _note; var dataString; data.forEach(function(it, index) { - _amount = (it.action == 'sent' ? '-' : '') + (it.amount * satToBtc).toFixed(8); - _note = formatString((it.message ? 'Note: ' + it.message + ' - ' : '') + 'TxId: ' + it.txid); + var amount = it.amount; + + if (it.action == 'moved') + amount = 0; + + if (it.action == 'sent' || it.action=='moved') + amount += it.fees; + + _amount = (it.action == 'sent' ? '-' : '') + (amount * satToBtc).toFixed(8); + _note = formatString((it.message ? 'Note: ' + it.message + ' - ' : '') + 'TxId: ' + it.txid + ' Fee'+ (it.fees * satToBtc).toFixed(8)) ; + + if (it.action == 'moved') + _note += ' Moved:' + (it.amount * satToBtc).toFixed(8) + dataString = formatDate(it.time * 1000) + ',' + formatString(it.addressTo) + ',' + _note + ',' + _amount + ',BTC,,,,'; csvContent += index < data.length ? dataString + "\n" : dataString; }); From c7caf71e938a0ad8653457675e64b404f0b5f7f6 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 17 Jul 2015 15:51:12 -0300 Subject: [PATCH 032/158] add a new record for network fees --- src/js/controllers/index.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index dc6d91985..344feaf7e 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -608,8 +608,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (txs && txs.length > 0) { allTxs.push(txs); return getHistory(skip + 100, cb); - } - else { + } else { return cb(null, lodash.flatten(allTxs)); } }); @@ -637,7 +636,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.satToUnit = 1 / self.unitToSatoshi; var data = txs; var satToBtc = 1 / 100000000; - var filename = 'Copay-' + (self.alias || self.walletName ) + '.csv'; + var filename = 'Copay-' + (self.alias || self.walletName) + '.csv'; var csvContent = ''; if (!isNode) csvContent = 'data:text/csv;charset=utf-8,'; csvContent += 'Date,Destination,Note,Amount,Currency,Spot Value,Total Value,Tax Type,Category\n'; @@ -650,23 +649,24 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (it.action == 'moved') amount = 0; - if (it.action == 'sent' || it.action=='moved') - amount += it.fees; - - _amount = (it.action == 'sent' ? '-' : '') + (amount * satToBtc).toFixed(8); - _note = formatString((it.message ? 'Note: ' + it.message + ' - ' : '') + 'TxId: ' + it.txid + ' Fee'+ (it.fees * satToBtc).toFixed(8)) ; + _amount = (it.action == 'sent' ? '-' : '') + (amount * satToBtc).toFixed(8); + _note = formatString((it.message ? it.message : '') + ' TxId: ' + it.txid + ' Fee:' + (it.fees * satToBtc).toFixed(8)); if (it.action == 'moved') - _note += ' Moved:' + (it.amount * satToBtc).toFixed(8) + _note += ' Moved:' + (it.amount * satToBtc).toFixed(8) dataString = formatDate(it.time * 1000) + ',' + formatString(it.addressTo) + ',' + _note + ',' + _amount + ',BTC,,,,'; - csvContent += index < data.length ? dataString + "\n" : dataString; + csvContent += dataString + "\n"; + + if (it.fees && (it.action == 'moved' || it.action == 'sent')) { + var _fee = (it.fees * satToBtc).toFixed(8) + csvContent += formatDate(it.time * 1000) + ',Bitcoin Network Fees,, -' + _fee + ',BTC,,,,' + "\n"; + } }); if (isNode) { saveFile('#export_file', csvContent); - } - else { + } else { var encodedUri = encodeURI(csvContent); var link = document.createElement("a"); link.setAttribute("href", encodedUri); From 390a7f5856ee4ba32fbea4f3fc10d84edc58dbf2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 17 Jul 2015 16:51:52 -0300 Subject: [PATCH 033/158] Update README.md We are using crowdin for translations. --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index aef68f66d..2ffff90df 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Copay [![Build Status](https://secure.travis-ci.org/bitpay/copay.svg)](http://travis-ci.org/bitpay/copay) +[![Crowdin](https://d322cqt584bo4o.cloudfront.net/copay/localized.png)](https://crowdin.com/project/copay) Copay is an easy-to-use, open-source, multiplatform, multisignature, secure bitcoin wallet platform for both individuals and companies. Copay uses [Bitcore Wallet Service](https://github.com/bitpay/bitcore-wallet-service) (BWS) for peer synchronization and bitcore network interfacing. @@ -100,7 +101,9 @@ For more information regarding how addresses are generated using this procedure, Copay depends on [Bitcore Wallet Service](https://github.com/bitpay/bitcore-wallet-service) (BWS) for blockchain information, networking and copayer synchronization. A BWS instance can be setup and operational within minutes or you can use a public instance like `https://bws.bitpay.com`. Switching between BWS instances is very simple and can be done with a click from within Copay. BWS also allows Copay to interoperate with others wallet like [Bitcore Wallet CLI] (https://github.com/bitpay/bitcore-wallet). ## Translations -Copay uses standard gettext PO files for translations and is currently translated to Spanish, Japanese, French, German and Portuguese thanks to community contributions. See https://github.com/bitpay/copay/pull/2880 as an example pull request for adding translations. +Copay uses standard gettext PO files for translations and [Crowdin](https://crowdin.com/project/copay) as front-end for translators. + +To join our team of translators, please create an account at [Crowdin](https://crowdin.com) and sends the request to the language that you want to translate. **Translation Credits:** - Japanese: @dabura667 From 937aecd8b4b73543a4bf39e62e185bab8e5664b9 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 18 Jul 2015 14:52:36 +0900 Subject: [PATCH 034/158] Fix Japanese and English --- po/ja.po | 10 +++++----- po/template.pot | 5 +++-- src/js/controllers/walletHome.js | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/po/ja.po b/po/ja.po index 536ff0299..bc08d5b14 100644 --- a/po/ja.po +++ b/po/ja.po @@ -258,7 +258,7 @@ msgstr "送金できませんでした。接続を確認し、やり直して下 #: src/js/controllers/walletHome.js msgid "" -"Could not connect wallet service. Check your Internet connexion and your " +"Could not connect wallet service. Check your Internet connection and your " "wallet service configuration." msgstr "" "ウォレットサービスと接続できませんでした。インターネットの接続とウォレット" @@ -303,7 +303,7 @@ msgstr "指定された拡張秘密鍵で参加できませんでした。" #: src/js/controllers/join.js msgid "Could not join wallet:" -msgstr "ウォレットに参加できませんでした。" +msgstr "ウォレットに参加できませんでした：" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" @@ -444,7 +444,7 @@ msgstr "ウォレット作成時にエラー発生、インターネットの接 #: src/js/services/profileService.js msgid "Error importing wallet:" -msgstr "ウォレットインポート時にエラー" +msgstr "ウォレットインポート時にエラー：" #: public/views/modals/paypro.html public/views/modals/txp-details.html msgid "Expires" @@ -462,7 +462,7 @@ msgstr "ウォレットのインポート失敗しました" msgid "Family vacation funds" msgstr "家族旅行貯金" -#: public/views/modals/txp-details.html +#: public/views/modals/tx-details.html public/views/modals/txp-details.html msgid "Fee" msgstr "手数料" @@ -1251,7 +1251,7 @@ msgstr "ウォレット名" #: src/js/controllers/walletHome.js msgid "" -"Wallet service timed out. Check your Internet connexion and your wallet " +"Wallet service timed out. Check your Internet connection and your wallet " "service configuration." msgstr "" "ウォレットサービスがタイムアウトになりました。インターネットの接続とウォレッ" diff --git a/po/template.pot b/po/template.pot index 493cdeae7..58cddeb22 100644 --- a/po/template.pot +++ b/po/template.pot @@ -229,7 +229,7 @@ msgid "Could not broadcast payment. Check you connection and try again" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connexion and your wallet service configuration." +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." msgstr "" #: src/js/controllers/walletHome.js @@ -433,6 +433,7 @@ msgstr "" msgid "Family vacation funds" msgstr "" +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Fee" msgstr "" @@ -1133,7 +1134,7 @@ msgid "Wallet name" msgstr "" #: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connexion and your wallet service configuration." +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." msgstr "" #: public/views/preferencesDeleteWallet.html diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 4ada49f85..38873a39f 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -98,11 +98,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (err.message) { // TODO : this is not used anymore? if (err.message.indexOf('CORS') >= 0) { - err.message = gettext('Could not connect wallet service. Check your Internet connexion and your wallet service configuration.'); + err.message = gettext('Could not connect wallet service. Check your Internet connection and your wallet service configuration.'); } if (err.message.indexOf('TIMEDOUT') >= 0) { - err.message = gettext('Wallet service timed out. Check your Internet connexion and your wallet service configuration.'); + err.message = gettext('Wallet service timed out. Check your Internet connection and your wallet service configuration.'); } } }; From ff9a45fae63f7185bdf898ddfa521d03fc886834 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sun, 19 Jul 2015 15:30:57 +0900 Subject: [PATCH 035/158] Add Greek appstore description --- cordova/docs/appstore_el | 61 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 cordova/docs/appstore_el diff --git a/cordova/docs/appstore_el b/cordova/docs/appstore_el new file mode 100644 index 000000000..b655e9e61 --- /dev/null +++ b/cordova/docs/appstore_el @@ -0,0 +1,61 @@ +-------------------------------- +Description +-------------------------------- +Εξασφαλίστε τα Bitcoin σας με τους δικούς σας όρους με ένα ανοιχτού κώδικα, πορτοφόλι πολλών υπογραφών από την BitPay. +Οι χρήστες copay μπορούν να κρατούν και να διαχειρίζονται κεφάλαια ατομικά ή να τα μοιράζονται με ασφάλεια με άλλους χρήστες με το πορτοφόλι πολλών υπογραφών, το οποίο εμποδίζει τις μη εξουσιοδοτημένες πληρωμές και απαιτεί πολλαπλές εγκρίσεις. Εδώ είναι μερικοί τρόποι με τους οποίους το copay μπορεί να χρησιμοποιηθεί σε συνδιασμό με άλλους ανθρώπους: + +Για να αποθηκεύσετε για τις διακοπές σας ή να κάνετε κοινές αγορές με τους φίλους σας +Για να παρακολουθήσετε τις οικογενειακές δαπάνες και τα επιδόμάτα +Για τη διαχείριση επιχειρήσεων, κλαμπ, ή κεφάλαια οργανισμών και έξοδα οργάνωσης + +Χτίσαμε τα ακόλουθα χαρακτηριστικά σε αυτή την έκδοση του copay για ένα πορτοφόλι Bitcoin που δεν θέτει σε κίνδυνο την ασφάλεια ή την προσβασιμότητα: + +Δημιουργία πολλαπλών πορτοφολιών και διαχείριση εντός εφαρμογής +Διαισθητική ασφαλείας πολλών υπογραφών για προσωπικά ή κοινόχρηστα πορτοφόλια +Εύκολη ροή προτάσεων δαπάνών για κοινόχρηστα πορτοφόλια και πληρωμές ομάδων +Ιεραρχική ντετερμινιστική δημιουργία διευθύνσεων (HD) και αντιγράφων ασφαλείας πορτοφολιού +Ασφάλεια με βάση τη συσκευή: όλα τα ιδιωτικά κλειδιά αποθηκεύονται τοπικά, όχι στο σύννεφο +Υποστήριξη για πορτοφόλια του δοκιμαστικού δικτύου Bitcoin +Σύγχρονισμένη πρόσβαση σε όλες τις μεγάλες πλατφόρμες, φορητές και επιτραπέζιες +Πρωτόκολλο πληρωμής (BIP70-BIP73) το οποίο υποστηρίζει: εύκολα αναγνωρίσιμες αιτήσεις πληρωμής και διασφάλισμένες και επαληθεύσιμες πληρωμές με Bitcoin +Υποστήριξη για επιλογές τιμολόγησης 150+ νομισμάτων και ονομαστική αξία σε BTC ή bits +Ειδοποιήσεις μέσω email για πληρωμές και μεταφορές +Προσαρμόσιμο όνομα πορτοφολιών και χρώματα φόντου +4 υποστηριζόμενες γλώσσες (Αγγλικά, Ιαπωνικά, Γαλλικά, Ισπανικά) + +Το Copay είναι ελεύθερο και ανοικτού κώδικα λογισμικό το οποίο τρέχει σε μη ιδιόκτητους διακομιστές, έτσι δεν υπάρχει καμία ανάγκη να στηριχθεί σε οποιαδήποτε εταιρεία για να έχει συνεχή υποστήριξη. Ο καθένας μπορεί να αναθεωρήσει ή να συμβάλει στον πηγαίο κώδικα του copay στο GitHub (https://github.com/bitpay/copay). + +-------------------------------- +Release Notes: "What's new" +-------------------------------- +v1.1.2 +-------------------------------- +* Τώρα είναι δυνατό να κάνετε αντίγραφα ασφαλείας, χωρίς δυνατότητες ψηφιακής υπογραφής (για περισσότερες πληροφορίες δείτε εδώ https://github.com/bitpay/copay/pull/2998) +* Βελτίωση των κανόνων ανανέωσης και της διαλογής στο ιστορικό συναλλαγών +* Καλύτερη διαχείριση των `λανθασμένων` συναλλαγών στο ιστορικό +* Καλύτερη διαχείριση των πορτοφολιών με 1000+ συναλλαγές στο ιστορικό τους +* Εξάγει τα αρχεία .csv με αναγνωριστικό συναλλαγής +* Καλύτερη πολιτική επιλογής αξόδευτων συναλλαγών +* Μικρές διορθώσεις σφαλμάτων +-------------------------------- +v1.1.0 +-------------------------------- +QR κώδικες με συγκεκριμένο ποσό για την είσπραξη πληρωμών +Μεταφορά χρημάτων μεταξύ πορτοφολιών +Ειδοποιήσεις ηλεκτρονικού ταχυδρομείου σε μορφή HTML +Προσαρμοσμένες ρυθμίσεις εξόδων συναλλαγών +Αποστολή ανώτατου ορίου των χρημάτων +Νέοι κανόνες διαγραφής πρότάσεων δαπανών +Διορθώσεις σφαλμάτων στη λειτουργία εκτός σύνδεσης +-------------------------------- +v1.0.2 +-------------------------------- +Το Copay είναι εκτός της δοκιμαστικής έκδοσης Βήτα! Έχουμε ολοκληρώσει οκτώ μήνες δοκιμών με το copay, και είμαστε έτοιμοι για την παραγωγή. +-------------------------------- +v1.0.1 +-------------------------------- +Καλύτερη διαχείριση των σφαλμάτων διακοπής του δικτύου +Καλύτερη λογική ανανέωσης μετά την αποδοχή/απόρριψη πληρωμών +Ενημερώσεις στις μεταφράσεις των Ισπανικών των Γαλλικών και των Ιαπωνικών +Διορθώσαμε την λειτουργία μετακίνησης μεσα σε ορισμένα πλαίσια κειμένου +-------------------------------- \ No newline at end of file From 5220611cc30ab6aea14aed2f7defa5a5be7e618d Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 20 Jul 2015 15:21:14 -0300 Subject: [PATCH 036/158] Removes unused Grunt functions --- .gitignore | 3 --- Gruntfile.js | 45 ++------------------------------------------- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 837bbf05d..f8bacc9bc 100644 --- a/.gitignore +++ b/.gitignore @@ -26,9 +26,6 @@ browser-extensions/chrome/copay-chrome-extension.zip logs *.log -# readme -README.html - # Runtime data pids *.pid diff --git a/Gruntfile.js b/Gruntfile.js index 0ab31cdc4..faff681d9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,27 +3,6 @@ module.exports = function(grunt) { // Project Configuration grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), - release: { - options: { - bump: true, - file: 'package.json', - add: true, - commit: true, - tag: true, - push: true, - pushTags: true, - npm: false, - npmtag: true, - tagName: 'v<%= version %>', - commitMessage: 'New release v<%= version %>', - tagMessage: 'Version <%= version %>', - github: { - repo: 'bitpay/copay', - usernameVar: 'GITHUB_USERNAME', //ENVIRONMENT VARIABLE that contains Github username - passwordVar: 'GITHUB_PASSWORD' //ENVIRONMENT VARIABLE that contains Github password - } - } - }, exec: { version: { command: 'node ./util/version.js' @@ -45,10 +24,6 @@ module.exports = function(grunt) { grunt.log.writeln('Waiting for more changes...'); }, }, - readme: { - files: ['README.md'], - tasks: ['markdown'] - }, css: { files: ['src/css/*.css'], tasks: ['concat:css'] @@ -67,16 +42,6 @@ module.exports = function(grunt) { tasks: ['concat:js'] } }, - markdown: { - all: { - files: [{ - expand: true, - src: 'README.md', - dest: './doc', - ext: '.html' - }] - } - }, concat: { options: { sourceMap: false, @@ -234,20 +199,14 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-angular-gettext'); - grunt.loadNpmTasks('grunt-markdown'); - grunt.loadNpmTasks('grunt-release'); grunt.loadNpmTasks('grunt-exec'); grunt.loadNpmTasks('grunt-karma'); grunt.loadNpmTasks('grunt-karma-coveralls'); grunt.loadNpmTasks('grunt-node-webkit-builder'); grunt.loadNpmTasks('grunt-contrib-compress'); - grunt.registerTask('default', [ - 'nggettext_compile', 'exec:version', 'concat', 'copy:icons' - ]); - grunt.registerTask('prod', [ - 'default', 'uglify' - ]); + grunt.registerTask('default', ['nggettext_compile', 'exec:version', 'concat', 'copy:icons']); + grunt.registerTask('prod', ['default', 'uglify']); grunt.registerTask('translate', ['nggettext_extract']); grunt.registerTask('test', ['karma:unit']); grunt.registerTask('test-coveralls', ['karma:prod', 'coveralls']); From c21e3f827ab04f7049e4d15c386fd7c3b9017443 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 18 Jul 2015 01:12:16 +0900 Subject: [PATCH 037/158] Added script for Crowdin automation (incomplete) --- .gitignore | 3 +- Gruntfile.js | 2 +- i18n/crowdin_update.js | 99 ++++++++++++++++++++++++++++++ {cordova => i18n}/docs/appstore_de | 0 {cordova => i18n}/docs/appstore_en | 0 {cordova => i18n}/docs/appstore_es | 0 {cordova => i18n}/docs/appstore_fr | 0 {cordova => i18n}/docs/appstore_ja | 0 {cordova => i18n}/docs/appstore_pt | 0 {po => i18n/po}/de.po | 0 {po => i18n/po}/es.po | 0 {po => i18n/po}/fr.po | 0 {po => i18n/po}/ja.po | 0 {po => i18n/po}/pt.po | 0 {po => i18n/po}/template.pot | 0 package.json | 1 + 16 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 i18n/crowdin_update.js rename {cordova => i18n}/docs/appstore_de (100%) rename {cordova => i18n}/docs/appstore_en (100%) rename {cordova => i18n}/docs/appstore_es (100%) rename {cordova => i18n}/docs/appstore_fr (100%) rename {cordova => i18n}/docs/appstore_ja (100%) rename {cordova => i18n}/docs/appstore_pt (100%) rename {po => i18n/po}/de.po (100%) rename {po => i18n/po}/es.po (100%) rename {po => i18n/po}/fr.po (100%) rename {po => i18n/po}/ja.po (100%) rename {po => i18n/po}/pt.po (100%) rename {po => i18n/po}/template.pot (100%) diff --git a/.gitignore b/.gitignore index f8bacc9bc..762a6d9e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # translation -po/*.mo +i18n/po/*.mo +i18n/crowdin_api_key.txt src/js/translations.js # version diff --git a/Gruntfile.js b/Gruntfile.js index faff681d9..23e7a0c60 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -109,7 +109,7 @@ module.exports = function(grunt) { nggettext_extract: { pot: { files: { - 'po/template.pot': [ + 'i18n/po/template.pot': [ 'public/index.html', 'public/views/*.html', 'public/views/**/*.html', diff --git a/i18n/crowdin_update.js b/i18n/crowdin_update.js new file mode 100644 index 000000000..a434460bb --- /dev/null +++ b/i18n/crowdin_update.js @@ -0,0 +1,99 @@ +#!/usr/bin/env node + +'use strict'; + +var fs = require('fs') +var querystring = require('querystring'); +var http = require('http'); +var AdmZip = require('adm-zip'); + +var crowdin_identifier = 'copay' + +var crowdin_file_name1 = 'template.pot' +var local_file_name1 = './po/template.pot' + +var crowdin_file_name2 = 'template.pot' +var local_file_name2 = './docs/appstore_en' + +// obtain the crowdin api key +var crowdin_api_key = ''; +fs.readFile('./crowdin_api_key.txt', 'utf8', function (err, data) { + if (err) { + return console.log(err); + } + crowdin_api_key = data; +}); + + +if (crowdin_api_key != '') { + var host_url = 'http://api.crowdin.com/api/project/' + crowdin_identifier + '/update-file?key=' + crowdin_api_key; + + var post_data = querystring.stringify({ + 'files[' + crowdin_file_name1 + ']' : '@' + local_file_name1, + 'files[' + crowdin_file_name2 + ']' : '@' + local_file_name2 + }); + + var post_options = { + host: host_url, + port: '80', + path: '', + method: 'POST', + headers: { + 'Content-Type': 'multipart/form-data', + 'Content-Length': post_data.length + } + }; + + var post_req = http.request(post_options, function(res) { + res.setEncoding('utf8'); + res.on('data', function (chunk) { + console.log('Response: ' + chunk); + }); + }); + + post_req.on('error', function(e) { + console.log('problem with request: ' + e.message); + }); + + post_req.write(post_data); + + // This post updates the english files on crowdin. + // https://crowdin.com/page/api/update-file + post_req.end(); + + // This call will tell the server to generate a new zip file for you based on most recent translations. + http.get('http://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key, function(res) { + console.log("Got response: " + res.statusCode); + }).on('error', function(e) { + console.log("Got error: " + e.message); + }); + +}; + + +// Download most recent translations for all languages. +http.get('http://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { + var data = [], dataLen = 0; + + res.on('data', function(chunk) { + data.push(chunk); + dataLen += chunk.length; + }).on('end', function() { + var buf = new Buffer(dataLen); + for (var i=0, len = data.length, pos = 0; i < len; i++) { + data[i].copy(buf, pos); + pos += data[i].length; + } + var zip = new AdmZip(buf); + var zipEntries = zip.getEntries(); + console.log(zipEntries.length) + for (var i = 0; i < zipEntries.length; i++) { + // parse each file from the zip, ex. http://crowdin.com/download/project/electrum.zip + // the filename for each file is the same, but they are separated into locale folder names. + // those foldernames might be able to be used to automatically rename each file to 'locale.po' like current. + + console.log(zip.readAsText(zipEntries[i])); + }; + }); +}); + diff --git a/cordova/docs/appstore_de b/i18n/docs/appstore_de similarity index 100% rename from cordova/docs/appstore_de rename to i18n/docs/appstore_de diff --git a/cordova/docs/appstore_en b/i18n/docs/appstore_en similarity index 100% rename from cordova/docs/appstore_en rename to i18n/docs/appstore_en diff --git a/cordova/docs/appstore_es b/i18n/docs/appstore_es similarity index 100% rename from cordova/docs/appstore_es rename to i18n/docs/appstore_es diff --git a/cordova/docs/appstore_fr b/i18n/docs/appstore_fr similarity index 100% rename from cordova/docs/appstore_fr rename to i18n/docs/appstore_fr diff --git a/cordova/docs/appstore_ja b/i18n/docs/appstore_ja similarity index 100% rename from cordova/docs/appstore_ja rename to i18n/docs/appstore_ja diff --git a/cordova/docs/appstore_pt b/i18n/docs/appstore_pt similarity index 100% rename from cordova/docs/appstore_pt rename to i18n/docs/appstore_pt diff --git a/po/de.po b/i18n/po/de.po similarity index 100% rename from po/de.po rename to i18n/po/de.po diff --git a/po/es.po b/i18n/po/es.po similarity index 100% rename from po/es.po rename to i18n/po/es.po diff --git a/po/fr.po b/i18n/po/fr.po similarity index 100% rename from po/fr.po rename to i18n/po/fr.po diff --git a/po/ja.po b/i18n/po/ja.po similarity index 100% rename from po/ja.po rename to i18n/po/ja.po diff --git a/po/pt.po b/i18n/po/pt.po similarity index 100% rename from po/pt.po rename to i18n/po/pt.po diff --git a/po/template.pot b/i18n/po/template.pot similarity index 100% rename from po/template.pot rename to i18n/po/template.pot diff --git a/package.json b/package.json index 56cd14751..5509a6c4c 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "test": "./node_modules/.bin/grunt test-coveralls" }, "devDependencies": { + "adm-zip": "git://github.com/cthackers/adm-zip.git", "angular": "^1.3.14", "angular-mocks": "^1.3.14", "grunt-contrib-compress": "^0.13.0", From bc0bddd5cba86123f20821bd8a6f20bcb328f839 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Tue, 21 Jul 2015 03:27:15 +0900 Subject: [PATCH 038/158] Finished API calls --- i18n/crowdin_update.js | 98 +- i18n/docs/{appstore_de => appstore_de.txt} | 31 +- i18n/docs/appstore_el.txt | 23 + i18n/docs/{appstore_en => appstore_en.txt} | 38 - i18n/docs/{appstore_es => appstore_es.txt} | 41 +- i18n/docs/appstore_fr | 62 - i18n/docs/appstore_fr.txt | 23 + i18n/docs/appstore_it.txt | 23 + i18n/docs/appstore_ja | 62 - i18n/docs/appstore_ja.txt | 23 + i18n/docs/{appstore_pt => appstore_pt.txt} | 28 +- i18n/docs/updateinfo_de.txt | 7 + i18n/docs/updateinfo_el.txt | 7 + i18n/docs/updateinfo_en.txt | 7 + i18n/docs/updateinfo_es.txt | 7 + i18n/docs/updateinfo_fr.txt | 7 + i18n/docs/updateinfo_it.txt | 7 + i18n/docs/updateinfo_ja.txt | 7 + i18n/docs/updateinfo_pt.txt | 7 + i18n/po/de.po | 405 ++++--- i18n/po/el.po | 1225 +++++++++++++++++++ i18n/po/es.po | 1248 +++----------------- i18n/po/fr.po | 82 +- i18n/po/it.po | 1225 +++++++++++++++++++ i18n/po/ja.po | 389 +++--- i18n/po/pt.po | 444 ++++--- 26 files changed, 3525 insertions(+), 2001 deletions(-) rename i18n/docs/{appstore_de => appstore_de.txt} (71%) create mode 100644 i18n/docs/appstore_el.txt rename i18n/docs/{appstore_en => appstore_en.txt} (54%) rename i18n/docs/{appstore_es => appstore_es.txt} (56%) delete mode 100644 i18n/docs/appstore_fr create mode 100644 i18n/docs/appstore_fr.txt create mode 100644 i18n/docs/appstore_it.txt delete mode 100644 i18n/docs/appstore_ja create mode 100644 i18n/docs/appstore_ja.txt rename i18n/docs/{appstore_pt => appstore_pt.txt} (68%) create mode 100644 i18n/docs/updateinfo_de.txt create mode 100644 i18n/docs/updateinfo_el.txt create mode 100644 i18n/docs/updateinfo_en.txt create mode 100644 i18n/docs/updateinfo_es.txt create mode 100644 i18n/docs/updateinfo_fr.txt create mode 100644 i18n/docs/updateinfo_it.txt create mode 100644 i18n/docs/updateinfo_ja.txt create mode 100644 i18n/docs/updateinfo_pt.txt create mode 100644 i18n/po/el.po create mode 100644 i18n/po/it.po diff --git a/i18n/crowdin_update.js b/i18n/crowdin_update.js index a434460bb..392062325 100644 --- a/i18n/crowdin_update.js +++ b/i18n/crowdin_update.js @@ -2,77 +2,54 @@ 'use strict'; -var fs = require('fs') -var querystring = require('querystring'); -var http = require('http'); +var fs = require('fs'); +var path = require('path'); +var https = require('https'); var AdmZip = require('adm-zip'); +var bhttp = require("bhttp"); var crowdin_identifier = 'copay' -var crowdin_file_name1 = 'template.pot' -var local_file_name1 = './po/template.pot' +var crowdin_file_name1 = 'files[template.pot]' +var local_file_name1 = path.join(__dirname, 'po/template.pot') +var local_file1 = fs.createReadStream(local_file_name1) -var crowdin_file_name2 = 'template.pot' -var local_file_name2 = './docs/appstore_en' +var crowdin_file_name2 = 'files[appstore/appstore_en.txt]' +var local_file_name2 = path.join(__dirname, 'docs/appstore_en.txt') +var local_file2 = fs.createReadStream(local_file_name2) + +var crowdin_file_name3 = 'files[appstore/updateinfo_en.txt]' +var local_file_name3 = path.join(__dirname, 'docs/updateinfo_en.txt') +var local_file3 = fs.createReadStream(local_file_name3) // obtain the crowdin api key -var crowdin_api_key = ''; -fs.readFile('./crowdin_api_key.txt', 'utf8', function (err, data) { - if (err) { - return console.log(err); - } - crowdin_api_key = data; -}); - +var crowdin_api_key = fs.readFileSync(path.join(__dirname, 'crowdin_api_key.txt')).slice(3) //slicing utf-8 BOM +//console.log('api key: ' + crowdin_api_key); if (crowdin_api_key != '') { - var host_url = 'http://api.crowdin.com/api/project/' + crowdin_identifier + '/update-file?key=' + crowdin_api_key; - var post_data = querystring.stringify({ - 'files[' + crowdin_file_name1 + ']' : '@' + local_file_name1, - 'files[' + crowdin_file_name2 + ']' : '@' + local_file_name2 - }); - - var post_options = { - host: host_url, - port: '80', - path: '', - method: 'POST', - headers: { - 'Content-Type': 'multipart/form-data', - 'Content-Length': post_data.length - } + var payload = { + 'files[template.pot]': local_file1, + 'files[appstore/appstore_en.txt]': local_file2, + 'files[appstore/updateinfo_en.txt]': local_file3 }; - - var post_req = http.request(post_options, function(res) { - res.setEncoding('utf8'); - res.on('data', function (chunk) { - console.log('Response: ' + chunk); - }); - }); - - post_req.on('error', function(e) { - console.log('problem with request: ' + e.message); - }); - - post_req.write(post_data); - - // This post updates the english files on crowdin. - // https://crowdin.com/page/api/update-file - post_req.end(); + + bhttp.post('https://api.crowdin.com/api/project/' + crowdin_identifier + '/update-file?key=' + crowdin_api_key, payload, {}, function(err, response) { + console.log("Response from hosting service:", response.body.toString()); + }) // This call will tell the server to generate a new zip file for you based on most recent translations. - http.get('http://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key, function(res) { - console.log("Got response: " + res.statusCode); + https.get('https://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key, function(res) { + console.log("Export Got response: " + res.statusCode); }).on('error', function(e) { - console.log("Got error: " + e.message); + console.log("Export Got error: " + e.message); }); }; // Download most recent translations for all languages. -http.get('http://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { +https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { var data = [], dataLen = 0; res.on('data', function(chunk) { @@ -80,20 +57,13 @@ http.get('http://crowdin.com/download/project/' + crowdin_identifier + '.zip', f dataLen += chunk.length; }).on('end', function() { var buf = new Buffer(dataLen); - for (var i=0, len = data.length, pos = 0; i < len; i++) { - data[i].copy(buf, pos); - pos += data[i].length; - } - var zip = new AdmZip(buf); - var zipEntries = zip.getEntries(); - console.log(zipEntries.length) - for (var i = 0; i < zipEntries.length; i++) { - // parse each file from the zip, ex. http://crowdin.com/download/project/electrum.zip - // the filename for each file is the same, but they are separated into locale folder names. - // those foldernames might be able to be used to automatically rename each file to 'locale.po' like current. - - console.log(zip.readAsText(zipEntries[i])); + for (var i=0, len = data.length, pos = 0; i < len; i++) { + data[i].copy(buf, pos); + pos += data[i].length; }; + var zip = new AdmZip(buf); + zip.extractAllTo("./", true); + console.log("Done extracting ZIP file."); }); }); diff --git a/i18n/docs/appstore_de b/i18n/docs/appstore_de.txt similarity index 71% rename from i18n/docs/appstore_de rename to i18n/docs/appstore_de.txt index e0448ff0c..5cc3453f1 100644 --- a/i18n/docs/appstore_de +++ b/i18n/docs/appstore_de.txt @@ -1,20 +1,16 @@ --------------------------------- -Google Play Store Beschreibung --------------------------------- Sichere Bitcoins zu eigenen Bedingungen, mit einem quelloffenen Gemeinschaftswallet(elektronische Brieftasche mit Mehrfachunterschriften) von BitPay. -Copay Nutzer können ihre Beträge individuell speichern oder ihre Finanzen mit anderen Nutzern in Gemeinschaftswallets teilen, die je nach Einstellung mehrere Bestätigungen (elektronische Unterschriften) benötigen und so nichtautorisierte Zahlungen verhindern. -Ein paar Einsatzmöglichkeiten, wie ein solches Wallet mit anderen Copayern genutzt werden kann: +Copay Nutzer können ihre Beträge individuell speichern oder ihre Finanzen mit anderen Nutzern in Gemeinschaftswallets teilen, die je nach Einstellung mehrere Bestätigungen (elektronische Unterschriften) benötigen und so nichtautorisierte Zahlungen verhindern. Ein paar Einsatzmöglichkeiten, wie ein solches Wallet mit anderen Copayern genutzt werden kann: -Ansparen von Beträgen für Urlaub oder gemeinsame Anschaffungen (z.B. mit Freunden) +Ansparen von Beträgen für Urlaub oder gemeinsame Anschaffungen (z.B. mit Freunden) Überwachung von Ausgaben und Einkünften der Familie Organisation der Ausgaben in Firmen, Vereinen oder Organisationen Folgende Funktionen wurden in diese Version von Copay eingebaut um ein Bitcoin Wallet anzubieten das keine Kompromisse in Sichereit oder Zugänglichkeit eingeht: -Anlage und Verwaltung von mehreren Wallets innerhalb der Anwendung -Intiutive mehrfachunterschriften Sicherheit für persönliche und geteilete Wallets +Anlage und Verwaltung von mehreren Wallets innerhalb der Anwendung +Intiutive mehrfachunterschriften Sicherheit für persönliche und geteilete Wallets Einfache Ausgabenvorschläge für geteilte Walltes und Gruppenzahlungen -Hierarchische deterministische(HD) Adresserzeugung und Sicherung der Wallets +Hierarchische deterministische(HD) Adresserzeugung und Sicherung der Wallets Gerätebasierte Sicherheit: Alle privaten Schlüssel werden auf dem Gerät und nicht in der Cloud gespreichert Unterstützung von Bitcoin Testnet Wallets Gleichzeitiger Zugriff über alle wichtigen mobilen Systeme und Desktop-Plattformen @@ -24,19 +20,4 @@ E-Mail Benachrichtigung für Zahlungen und Transaktionen Anpasspare Wallets: Eigene Namen und Hintergrundfarben 6 unterstützte Sprachen (deutsch, englisch, spanisch, französisch, japanisch, portugiesisch) -Copay ist eine kostenlose und quelloffene Software, die auf nicht firmeneigenen Servern läuft und es somit nicht nötig ist, sich auf ein bestimmtes Unternehmen und dessen kontinuierliche Unterstützung zu verlassen. Jeder hat die Möglichkeit den Quelltext zu überprüfen oder auf GitHub (https://github.com/bitpay/copay) eigene Änderungen beizutragen und an der Weiterentwicklung mitzuwirken. - --------------------------------- -Google Play Store Release Notes: "What's new" --------------------------------- -v1.0.2 --------------------------------- -Nach achtmonatigem Test hat Copay die Betaphase verlassen! --------------------------------- -v1.0.1 --------------------------------- -Besserer Umgang mit Fehlern durch Netzwerkunterbrechungen -Bessere Logik nach Akzeptanz oder Ablehung von Zahlungen -Aktualisierung von ES, FR and JP Übersetzungen -Korrektur der Scroll-/Blätterfunktion in einigen Popups --------------------------------- +Copay ist eine kostenlose und quelloffene Software, die auf nicht firmeneigenen Servern läuft und es somit nicht nötig ist, sich auf ein bestimmtes Unternehmen und dessen kontinuierliche Unterstützung zu verlassen. Jeder hat die Möglichkeit den Quelltext zu überprüfen oder auf GitHub (https://github.com/bitpay/copay) eigene Änderungen beizutragen und an der Weiterentwicklung mitzuwirken. diff --git a/i18n/docs/appstore_el.txt b/i18n/docs/appstore_el.txt new file mode 100644 index 000000000..fb00582c0 --- /dev/null +++ b/i18n/docs/appstore_el.txt @@ -0,0 +1,23 @@ +Εξασφαλίστε τα Bitcoin σας με τους δικούς σας όρους με ένα ανοιχτού κώδικα, πορτοφόλι πολλών υπογραφών από την BitPay. +Οι χρήστες copay μπορούν να κρατούν και να διαχειρίζονται κεφάλαια ατομικά ή να τα μοιράζονται με ασφάλεια με άλλους χρήστες με το πορτοφόλι πολλών υπογραφών, το οποίο εμποδίζει τις μη εξουσιοδοτημένες πληρωμές και απαιτεί πολλαπλές εγκρίσεις. Εδώ είναι μερικοί τρόποι με τους οποίους το copay μπορεί να χρησιμοποιηθεί σε συνδιασμό με άλλους ανθρώπους: + +Για να αποθηκεύσετε για τις διακοπές σας ή να κάνετε κοινές αγορές με τους φίλους σας +Για να παρακολουθήσετε τις οικογενειακές δαπάνες και τα επιδόμάτα +Για τη διαχείριση επιχειρήσεων, κλαμπ, ή κεφάλαια οργανισμών και έξοδα οργάνωσης + +Χτίσαμε τα ακόλουθα χαρακτηριστικά σε αυτή την έκδοση του copay για ένα πορτοφόλι Bitcoin που δεν θέτει σε κίνδυνο την ασφάλεια ή την προσβασιμότητα: + +Δημιουργία πολλαπλών πορτοφολιών και διαχείριση εντός εφαρμογής +Διαισθητική ασφαλείας πολλών υπογραφών για προσωπικά ή κοινόχρηστα πορτοφόλια +Εύκολη ροή προτάσεων δαπάνών για κοινόχρηστα πορτοφόλια και πληρωμές ομάδων +Ιεραρχική ντετερμινιστική δημιουργία διευθύνσεων (HD) και αντιγράφων ασφαλείας πορτοφολιού +Ασφάλεια με βάση τη συσκευή: όλα τα ιδιωτικά κλειδιά αποθηκεύονται τοπικά, όχι στο σύννεφο +Υποστήριξη για πορτοφόλια του δοκιμαστικού δικτύου Bitcoin +Σύγχρονισμένη πρόσβαση σε όλες τις μεγάλες πλατφόρμες, φορητές και επιτραπέζιες +Πρωτόκολλο πληρωμής (BIP70-BIP73) το οποίο υποστηρίζει: εύκολα αναγνωρίσιμες αιτήσεις πληρωμής και διασφάλισμένες και επαληθεύσιμες πληρωμές με Bitcoin +Υποστήριξη για επιλογές τιμολόγησης 150+ νομισμάτων και ονομαστική αξία σε BTC ή bits +Ειδοποιήσεις μέσω email για πληρωμές και μεταφορές +Προσαρμόσιμο όνομα πορτοφολιών και χρώματα φόντου +4 υποστηριζόμενες γλώσσες (Αγγλικά, Ιαπωνικά, Γαλλικά, Ισπανικά) + +Το Copay είναι ελεύθερο και ανοικτού κώδικα λογισμικό το οποίο τρέχει σε μη ιδιόκτητους διακομιστές, έτσι δεν υπάρχει καμία ανάγκη να στηριχθεί σε οποιαδήποτε εταιρεία για να έχει συνεχή υποστήριξη. Ο καθένας μπορεί να αναθεωρήσει ή να συμβάλει στον πηγαίο κώδικα του copay στο GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/appstore_en b/i18n/docs/appstore_en.txt similarity index 54% rename from i18n/docs/appstore_en rename to i18n/docs/appstore_en.txt index 33482b9ca..0a6e38fc8 100644 --- a/i18n/docs/appstore_en +++ b/i18n/docs/appstore_en.txt @@ -1,6 +1,3 @@ --------------------------------- -Description --------------------------------- Secure bitcoin on your own terms with an open source, multisignature wallet from BitPay. Copay users can hold funds individually or share finances securely with other users with multisignature wallets, which prevent unauthorized payments by requiring multiple approvals. Here are some ways Copay can be used with others: @@ -24,38 +21,3 @@ Customizable wallet naming and background colors 4 supported languages (EN, JP, FR, ES) Copay is free and open source software run on non-proprietary servers, so there's no need to rely on any company for continuous support. Anyone can review or contribute to Copay's source code on GitHub (https://github.com/bitpay/copay). - --------------------------------- -Release Notes: "What's new" --------------------------------- -v1.1.2 --------------------------------- -* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) -* Better refresh and sorting rules in transaction history -* Better handling of `invalid` transactions in history -* Better handling of wallets with 1K+ transactions in history -* Exports .csv files with transaction ID -* Better UTXOs selection polices -* Minor bug fixes --------------------------------- -v1.1.0 --------------------------------- -QR Codes with specified amount for Receiving Payments -Fund Transfer Between Wallets -HTML Email Notifications -Custom Transaction Fee Settings -Send Maximum Amount of Funds -New Spending Proposal Deletion Rules -Bugs Fixes for Offline Functionality --------------------------------- -v1.0.2 --------------------------------- -Copay is now out of beta! We've spent eight months testing Copay, and we're production-ready. --------------------------------- -v1.0.1 --------------------------------- -Better handling of network interruption errors -Better refresh logic after accepting/rejecting payments -Updates ES, JP and FR translations -Fix scroll with in certain popups --------------------------------- diff --git a/i18n/docs/appstore_es b/i18n/docs/appstore_es.txt similarity index 56% rename from i18n/docs/appstore_es rename to i18n/docs/appstore_es.txt index 332945d0b..f85dd3839 100644 --- a/i18n/docs/appstore_es +++ b/i18n/docs/appstore_es.txt @@ -1,52 +1,23 @@ --------------------------------- -Descripción --------------------------------- -Asegura tus bitcoin con tus propias reglas con el monedero de código abierto, multifirma de BitPay. - +Asegura tus bitcoin con tus propias reglas con el monedero de código abierto, multifirma de BitPay. Los usuario de Copay pueden mantener sus fondos individuales o compartir sus finanzas de forma segura con otros usuarios utilizando monederos multifirmas, que previenen de pagos sin autorización al requerir múltiples aprobaciones. Estas son algunas formas en que puede ser utilizado Copay con otros usuarios: -Ahorrar para vacaciones o compras conjuntas con amigos +Ahorrar para vacaciones o compras conjuntas con amigos Controlar los gastos familiares Manejar los fondos y gastos de negocios, clubes y organizaciones. Construimos las siguientes características en esta versión de Copay que no compromete la seguridad ni la accesibilidad: -Creación y manejo de múltiples monederos dentro de la misma aplicación +Creación y manejo de múltiples monederos dentro de la misma aplicación Seguridad multifirma intuitiva para monederos personales y compartidos Sencillo flujo de propuesta de gastos para monederos compartidos y grupos de pagos -Generación de direcciones HD (Hierarchical deterministic) y copias de seguridad +Generación de direcciones HD (Hierarchical deterministic) y copias de seguridad Seguridad basada en el dispositivo: todas las claves privadas se guardan localmente, no en la nube Soporta monederos bitcoin en testnet -Acceso sincrónico desde las principales plataformas móviles y de escritorio +Acceso sincrónico desde las principales plataformas móviles y de escritorio Soporte al protocolo de pago (BIP70-BIP73): solicitudes de pagos fácilmente identificable y verificables como pago seguro en bitcoin Soporte a más de 150 precios de monedas y unidades de denominación en BTC o bits Notificaciones por email de pagos y transferencias Monederos con nombres y colores de fondo personalizables 4 idiomas soportados (EN, JP, FR, ES) -Copay es un software gratuito y de código abierto que funciona en servidores no-propietarios, por lo que no es necesario confiar en una empresa para soporte continuo. Cualquier persona puede revisar y contribuir al código fuente de Copay en GitHub (https://github.com/bitpay/copay). - --------------------------------- -Notas de lanzamiento: "Qué hay de nuevo" --------------------------------- -v1.1.2 --------------------------------- -* Copias de seguridad sin capacidad de firmar transacciones (más información https://github.com/bitpay/copay/pull/2998) -* Mejor reglas de orden y actualización en la historia de transacción -* Mejor manejo de transacciones no válidas -* Mejor manejo de monederos con 1K+ transacciones -* Exporta archivos .csv con el ID de transacción -* Mejor política de selección de UTXOs -* Corrección de errores menores --------------------------------- -v1.0.2 --------------------------------- -¡Copay esta fuera de beta! Estuvimos ocho meses probando Copay, y ahora estamos listos en producción. --------------------------------- -v1.0.1 --------------------------------- -Mejor manejo de errores en interrupciones de la red -Mejor lógica de actualización luego de aceptar/rechazar pagos -Actualiza traducciones en ES, JR y FR. -Corrige el desplazamiento en algunas ventanas emergentes --------------------------------- +Copay es un software gratuito y de código abierto que funciona en servidores no-propietarios, por lo que no es necesario confiar en una empresa para soporte continuo. Cualquier persona puede revisar y contribuir al código fuente de Copay en GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/appstore_fr b/i18n/docs/appstore_fr deleted file mode 100644 index bf4c4ef37..000000000 --- a/i18n/docs/appstore_fr +++ /dev/null @@ -1,62 +0,0 @@ --------------------------------- -Description --------------------------------- -Sécurisez vos bitcoins selon vos conditions avec un portefeuille open source et multi-signatures par BitPay. -Les utilisateurs de Copay peuvent détenir leurs fonds de manière individuelle, ou partager leurs finances de manière sécurisée avec les autres utilisateurs en utilisant des portefeuilles multi-signatures, ce qui empêche les paiements non autorisés en exigeant des approbations multiples. -Voici quelques exemples d'utilisation que vous pouvez avoir avec Copay et avec d'autres utilisateurs : - -• Économiser pour des vacances ou partager des frais avec des amis. -• Suivre des dépenses et remboursements familiaux. -• Gérer des fonds et des dépenses pour une entreprise, un club ou une organisation. - -Nous avons développé les fonctionnalités suivantes dans cette version de Copay pour un portefeuille bitcoin qui ne fait pas de compromis sur la sécurité ou sur l'accessibilité : - -• Création et gestion de portefeuilles multiples. -• Sécurité de multi-signatures intuitive pour les portefeuilles personnels ou partagés. -• Demande de paiement facile pour les portefeuilles partagés et pour les paiements de groupe. -• Génération d'adresse déterministe hiérarchique (HD) et sauvegardes de portefeuilles. -• Sécurité basée sur l'appareil : toutes les clés privées sont stockées localement, pas dans le cloud. -• Prise en charge des portefeuilles bitcoin testnet. -• Accès synchrone sur toutes les principales plateformes mobiles et de bureau. -• Prise en charge de Payment protocol (BIP70-BIP73) : demandes de paiement facilement identifiables et paiements bitcoins sécurisés et vérifiables. -• Prise en charge de plus de 150 devises et dénomination d'unité en BTC ou en bits. -• Notifications e-mail pour les paiements et les transferts. -• Nom de portefeuille et couleurs de fond personnalisables. -• 4 langues prises en charge (EN, JP, FR, ES). - -Copay est un logiciel gratuit et open source qui tourne sur des serveurs non-propriétaires, il n'y a donc pas besoin de compter sur une entreprise pour un support continuel. N'importe qui peut examiner ou contribuer au code source de Copay sur GitHub (https://github.com/bitpay/copay). - --------------------------------- -Release Notes: "What's new" --------------------------------- -v1.1.2 --------------------------------- -• Il est maintenant possible de faire des sauvegardes sans les capacités de signature (plus d'informations sur https://github.com/bitpay/copay/pull/2998) -• Meilleures règles d'actualisation et de tri dans l'historique des transactions -• Meilleure prise en charge des transactions 'invalides' dans l'historique -• Meilleure prise en charge des portefeuilles avec plus de 1000 transactions dans l'historique -• Exportez les fichiers .csv avec un ID de transaction -• Meilleures politiques de sélection des UTXO -• Corrections de bugs mineurs --------------------------------- -v1.1.0 --------------------------------- -• Code QR avec montant personnalisable pour recevoir des paiements. -• Transfert de fonds entre portefeuilles. -• Notifications e-mail HTML. -• Frais de transactions personnalisables. -• Possibilité d'envoyer le montant maximal des fonds disponibles. -• Nouvelles règles de suppression des propositions de dépenses. -• Corrections de bugs pour les fonctionnalités hors ligne. --------------------------------- -v1.0.2 --------------------------------- -Copay est sorti de sa phase beta ! Nous avons passé huit mois à tester Copay, et nous sommes prêts pour sa mise en production. --------------------------------- -v1.0.1 --------------------------------- -Meilleur traitement des erreurs d'interruption réseau -Meilleure logique de rafraichissement après l'acceptation/le rejet de paiements -Mise à jour des traductions ES, JP et FR -Corrige le défilement dans certaines pop-ups --------------------------------- diff --git a/i18n/docs/appstore_fr.txt b/i18n/docs/appstore_fr.txt new file mode 100644 index 000000000..055019f15 --- /dev/null +++ b/i18n/docs/appstore_fr.txt @@ -0,0 +1,23 @@ +Sécurisez vos bitcoins selon vos conditions avec un portefeuille open source et multi-signatures par BitPay. +Les utilisateurs de Copay peuvent détenir leurs fonds de manière individuelle, ou partager leurs finances de manière sécurisée avec les autres utilisateurs en utilisant des portefeuilles multi-signatures, ce qui empêche les paiements non autorisés en exigeant des approbations multiples. Voici quelques exemples d'utilisation que vous pouvez avoir avec Copay et avec d'autres utilisateurs : + +• Économiser pour des vacances ou partager des frais avec des amis. +• Suivre des dépenses et remboursements familiaux. +• Gérer des fonds et des dépenses pour une entreprise, un club ou une organisation. + +Nous avons développé les fonctionnalités suivantes dans cette version de Copay pour un portefeuille bitcoin qui ne fait pas de compromis sur la sécurité ou sur l'accessibilité : + +• Création et gestion de portefeuilles multiples. +• Sécurité de multi-signatures intuitive pour les portefeuilles personnels ou partagés. +• Demande de paiement facile pour les portefeuilles partagés et pour les paiements de groupe. +• Génération d'adresse déterministe hiérarchique (HD) et sauvegardes de portefeuilles. +• Sécurité basée sur l'appareil : toutes les clés privées sont stockées localement, pas dans le cloud. +• Prise en charge des portefeuilles bitcoin testnet. +• Accès synchrone sur toutes les principales plateformes mobiles et de bureau. +• Prise en charge de Payment protocol (BIP70-BIP73) : demandes de paiement facilement identifiables et paiements bitcoins sécurisés et vérifiables. +• Prise en charge de plus de 150 devises et dénomination d'unité en BTC ou en bits. +• Notifications e-mail pour les paiements et les transferts. +• Nom de portefeuille et couleurs de fond personnalisables. +• 4 langues prises en charge (EN, JP, FR, ES). + +Copay est un logiciel gratuit et open source qui tourne sur des serveurs non-propriétaires, il n'y a donc pas besoin de compter sur une entreprise pour un support continuel. N'importe qui peut examiner ou contribuer au code source de Copay sur GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/appstore_it.txt b/i18n/docs/appstore_it.txt new file mode 100644 index 000000000..0a6e38fc8 --- /dev/null +++ b/i18n/docs/appstore_it.txt @@ -0,0 +1,23 @@ +Secure bitcoin on your own terms with an open source, multisignature wallet from BitPay. +Copay users can hold funds individually or share finances securely with other users with multisignature wallets, which prevent unauthorized payments by requiring multiple approvals. Here are some ways Copay can be used with others: + +To save for vacations or joint purchases with friends +To track family spending and allowances +To manage business, club, or organization funds and expenses + +We built the following features into this version of Copay for a bitcoin wallet that doesn't compromise on security or accessibility: + +Multiple wallet creation and management in-app +Intuitive multisignature security for personal or shared wallets +Easy spending proposal flow for shared wallets and group payments +Hierarchical deterministic (HD) address generation and wallet backups +Device-based security: all private keys are stored locally, not in the cloud +Support for Bitcoin testnet wallets +Synchronous access across all major mobile and desktop platforms +Payment protocol (BIP70-BIP73) support: easily-identifiable payment requests and verifiably secure bitcoin payments +Support for 150+ currency pricing options and unit denomination in BTC or bits +Email notifications for payments and transfers +Customizable wallet naming and background colors +4 supported languages (EN, JP, FR, ES) + +Copay is free and open source software run on non-proprietary servers, so there's no need to rely on any company for continuous support. Anyone can review or contribute to Copay's source code on GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/appstore_ja b/i18n/docs/appstore_ja deleted file mode 100644 index 116dc51eb..000000000 --- a/i18n/docs/appstore_ja +++ /dev/null @@ -1,62 +0,0 @@ --------------------------------- -Description --------------------------------- -ビットコインにおける高度なセキュリティーを手軽に扱えるオープンソースマルチシグネチャウォレットです。 -Copayは個人のご利用はもちろんのこと、複数人によるウォレット管理の権限分散も簡単なウォレットソフトを通してご活用いただけます。 - -例えば： -友達との旅行や買い物のために透明性抜群の環境で貯蓄したい時 -家族のお小遣いや日常の家計簿管理がしたい時 -ビジネス・クラブ・団体の資金や財産管理を透明な管理分散がしたい時 - -下記の機能でセキュリティーも利便性も妥協しない最高のウォレットをCopayでご提供させていただきました： - -■ 複数のウォレットの作成・管理がアプリ内で管理可能 -■ マルチシグネチャのウォレット分散管理でも個人ウォレットでも使いやすさ抜群 -■ 送金の提案・承認・却下の流れが非常に直感的で分散管理が簡単 -■ 階級的決定性ウォレット(HDウォレット)でアドレス生成とバックアップ管理をしているためバックアップは永久に各参加者1回ずつのみ -■ 端末に依存するセキュリティー、秘密鍵が全て端末に保管され、サーバに送ることは無い -■ ビットコインの開発テスト用ネットワークにも対応 -■ メジャーなプラットフォーム全てに対応 (Windows, Mac, Linux, Android, iPhone, Windows Phone) -■ ペイメントプロトコルにも対応(BIP 70-73)、暗号通信と証明書を使ったマーチャントとの安全なペイメントの実現 -■ 世界中の150個以上の通貨の表示に対応、自国通貨との為替レートを計算する必要なし。ビットコインの単位も BTC と bits にも対応 -■ ペイメントや提案のメール通知も可能 -■ ウォレットごとの背景色設定や通称設定も可能でカスタマイズ性抜群 -■ 4ヶ国語に対応 (英日仏西) - -Copayは永久無料でオープンソースのソフトです。サーバーもオープンソースなので、独自運用や法人の利用やソース流用は許可します。ソースをご覧の際に間違いなどが見つかった場合、Githubにてご報告・ソース修正のプルリクエストなどをお願いします。(https://github.com/bitpay/copay) - --------------------------------- -Release Notes: "What's new" --------------------------------- -v1.1.2 --------------------------------- -■ 署名のできない、送金の提案のみできる閲覧専用のバックアップが作成できます。(詳細 https://github.com/bitpay/copay/pull/2998) -■ 取引履歴のソートとページ更新の品質向上 -■ 「無効」な取引の処理改善 -■ 1000個以上の取引履歴のあるウォレットの処理改善 -■ 取引のCSV出力可能 -■ 未使用出力(utxo)の選択ロジックの改善 -■ バグの修正 --------------------------------- -v1.1.0 --------------------------------- -■ QRコードによる指定額の受取要請。 -■ ウォレット間の送金が円滑に。 -■ メール通知のHTML化。 -■ ビットコインネットワーク手数料が指定可能に。 -■ ボタン一つで全残高を一気に送金が可能に。 -■ 送金の提案の取下げ条件の変更。 -■ オフライン機能のバグ修正。 --------------------------------- -v1.0.2 --------------------------------- -Copayがようやくベータ版を抜けてリリース版になりました！ 8ヶ月の時間を掛けて品質テストしてきたので、皆さんに安全に使っていただけるようになりました！ --------------------------------- -v1.0.1 --------------------------------- -ネットワーク接続エラーの処理改善 -送金の提案を承諾・却下した後の更新ロジックを改善 -スペイン語、日本語、フランス語の翻訳を更新 -特定のポップアップにおけるスクロール問題を改善 --------------------------------- diff --git a/i18n/docs/appstore_ja.txt b/i18n/docs/appstore_ja.txt new file mode 100644 index 000000000..3bdc7988a --- /dev/null +++ b/i18n/docs/appstore_ja.txt @@ -0,0 +1,23 @@ +ビットコインにおける高度なセキュリティーを手軽に扱えるオープンソースマルチシグネチャウォレットです。 +Copayは個人のご利用はもちろんのこと、複数人によるウォレット管理の権限分散も簡単なウォレットソフトを通してご活用いただけます。 例えば： + +友達との旅行や買い物のために透明性抜群の環境で貯蓄したい時 +家族のお小遣いや日常の家計簿管理がしたい時 +ビジネス・クラブ・団体の資金や財産管理を透明な管理分散がしたい時 + +下記の機能でセキュリティーも利便性も妥協しない最高のウォレットをCopayでご提供させていただきました： + +■ 複数のウォレットの作成・管理がアプリ内で管理可能 +■ マルチシグネチャのウォレット分散管理でも個人ウォレットでも使いやすさ抜群 +■ 送金の提案・承認・却下の流れが非常に直感的で分散管理が簡単 +■ 階級的決定性ウォレット(HDウォレット)でアドレス生成とバックアップ管理をしているためバックアップは永久に各参加者1回ずつのみ +■ 端末に依存するセキュリティー、秘密鍵が全て端末に保管され、サーバに送ることは無い +■ ビットコインの開発テスト用ネットワークにも対応 +■ メジャーなプラットフォーム全てに対応 (Windows, Mac, Linux, Android, iPhone, Windows Phone) +■ ペイメントプロトコルにも対応(BIP 70-73)、暗号通信と証明書を使ったマーチャントとの安全なペイメントの実現 +■ 世界中の150個以上の通貨の表示に対応、自国通貨との為替レートを計算する必要なし。ビットコインの単位も BTC と bits にも対応 +■ ペイメントや提案のメール通知も可能 +■ ウォレットごとの背景色設定や通称設定も可能でカスタマイズ性抜群 +■ 4ヶ国語に対応 (英日仏西) + +Copayは永久無料でオープンソースのソフトです。サーバーもオープンソースなので、独自運用や法人の利用やソース流用は許可します。 ソースをご覧の際に間違いなどが見つかった場合、Githubにてご報告・ソース修正のプルリクエストなどをお願いします。(https://github.com/bitpay/copay) diff --git a/i18n/docs/appstore_pt b/i18n/docs/appstore_pt.txt similarity index 68% rename from i18n/docs/appstore_pt rename to i18n/docs/appstore_pt.txt index 39fee8183..5c11244cd 100644 --- a/i18n/docs/appstore_pt +++ b/i18n/docs/appstore_pt.txt @@ -1,19 +1,16 @@ --------------------------------- -Google Play store description --------------------------------- Armazene bitcoin com seus próprios termos com uma carteira de multi-assinaturas, open source, do BitPay. Usuários Copay podem manter fundos individualmente ou compartilhar finanças seguramente com outros usuários por meio de carteiras multi-assinadas, que previnem pagamentos não autorizados por meio de múltiplas aprovações. Algumas formas que a Copay pode ser usada com outros: -Para economizar para férias ou juntar compras com amigos -Para rastrear despesas familiares e To track family spending and descontos +Para economizar para férias ou juntar compras com amigos +Para rastrear despesas familiares e descontos Para gerenciar negócios, clube ou organizar saldos e despesas Nós construímos as seguintes funcionalidades nesta versão da Copay para uma carteira bitcoin que não comprometa segurança ou acessibilidade: -Criação de múltiplas carteiras com gerenciamento no aplicativo +Criação de múltiplas carteiras com gerenciamento no aplicativo Segurança de multi-assinaturas intuitiva para carteiras pessoais ou compartilhadas Fácil fluxo de propostas de gastos para carteiras compartilhadas e pagamentos agrupados -Geração de endereço Hierarchical deterministic (HD) e backups de carteiras +Geração de endereço Hierarchical deterministic (HD) e backups de carteiras Segurança baseada em dispositivo: todas as chaves privadas são armazenadas localmente e não na nuvem Suporte para carteiras de testes na Bitcoin testnet Acesso síncrono entre todas as principais plataformas móveis e desktops @@ -23,19 +20,4 @@ Notificações por e-mail para pagamentos e transferências Nomes e cores de fundo customizáveis para carteiras 5 idiomas suportados (EN, JP, FR, ES, PT-BR) -Copay é gratuito e um software livre rodando em servidores não-proprietários, que não precisa de nenhuma empresa para o suporte contínuo. Qualquer um pode revisar ou contribuir para o código-fonte da Copay no GitHub (https://github.com/bitpay/copay). - --------------------------------- -Google Play store Release Notes: "What's new" --------------------------------- -v1.0.2 --------------------------------- -Copay agora está fora do beta! Nós gastamos oito meses testando a Copay e estamos prontos para entrar em produção. --------------------------------- -v1.0.1 --------------------------------- -Melhoria no tratamento de erros de interrupção de rede -Melhoria no lógica de renovação após aceitar/rejeitar pagamentos -Atualização das traduções para ES, JP e FR -Resolvida rolagem de certos popups --------------------------------- +Copay é gratuito e um software livre rodando em servidores não-proprietários, que não precisa de nenhuma empresa para o suporte contínuo. Qualquer um pode revisar ou contribuir para o código-fonte da Copay no GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/updateinfo_de.txt b/i18n/docs/updateinfo_de.txt new file mode 100644 index 000000000..6cc35687a --- /dev/null +++ b/i18n/docs/updateinfo_de.txt @@ -0,0 +1,7 @@ +* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) +* Better refresh and sorting rules in transaction history +* Better handling of `invalid` transactions in history +* Better handling of wallets with 1K+ transactions in history +* Exports .csv files with transaction ID +* Better UTXOs selection polices +* Minor bug fixes diff --git a/i18n/docs/updateinfo_el.txt b/i18n/docs/updateinfo_el.txt new file mode 100644 index 000000000..a42d506ce --- /dev/null +++ b/i18n/docs/updateinfo_el.txt @@ -0,0 +1,7 @@ +* Τώρα είναι δυνατό να κάνετε αντίγραφα ασφαλείας, χωρίς δυνατότητες ψηφιακής υπογραφής (για περισσότερες πληροφορίες δείτε εδώ https://github.com/bitpay/copay/pull/2998) +* Βελτίωση των κανόνων ανανέωσης και της διαλογής στο ιστορικό συναλλαγών +* Καλύτερη διαχείριση των `λανθασμένων` συναλλαγών στο ιστορικό +* Καλύτερη διαχείριση των πορτοφολιών με 1000+ συναλλαγές στο ιστορικό τους +* Εξάγει τα αρχεία .csv με αναγνωριστικό συναλλαγής +* Καλύτερη πολιτική επιλογής αξόδευτων συναλλαγών +* Μικρές διορθώσεις σφαλμάτων diff --git a/i18n/docs/updateinfo_en.txt b/i18n/docs/updateinfo_en.txt new file mode 100644 index 000000000..6cc35687a --- /dev/null +++ b/i18n/docs/updateinfo_en.txt @@ -0,0 +1,7 @@ +* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) +* Better refresh and sorting rules in transaction history +* Better handling of `invalid` transactions in history +* Better handling of wallets with 1K+ transactions in history +* Exports .csv files with transaction ID +* Better UTXOs selection polices +* Minor bug fixes diff --git a/i18n/docs/updateinfo_es.txt b/i18n/docs/updateinfo_es.txt new file mode 100644 index 000000000..7153b25b8 --- /dev/null +++ b/i18n/docs/updateinfo_es.txt @@ -0,0 +1,7 @@ +* Copias de seguridad sin capacidad de firmar transacciones (más información https://github.com/bitpay/copay/pull/2998) +* Mejor reglas de orden y actualización en la historia de transacción +* Mejor manejo de transacciones no válidas +* Mejor manejo de monederos con 1K+ transacciones +* Exporta archivos .csv con el ID de transacción +* Mejor política de selección de UTXOs +* Corrección de errores menores diff --git a/i18n/docs/updateinfo_fr.txt b/i18n/docs/updateinfo_fr.txt new file mode 100644 index 000000000..4aaf51127 --- /dev/null +++ b/i18n/docs/updateinfo_fr.txt @@ -0,0 +1,7 @@ +• Il est maintenant possible de faire des sauvegardes sans les capacités de signature (plus d'informations sur https://github.com/bitpay/copay/pull/2998) +• Meilleures règles d'actualisation et de tri dans l'historique des transactions +• Meilleure prise en charge des transactions 'invalides' dans l'historique +• Meilleure prise en charge des portefeuilles avec plus de 1000 transactions dans l'historique +• Exportez les fichiers .csv avec un ID de transaction +• Meilleures politiques de sélection des UTXO +• Corrections de bugs mineurs diff --git a/i18n/docs/updateinfo_it.txt b/i18n/docs/updateinfo_it.txt new file mode 100644 index 000000000..6cc35687a --- /dev/null +++ b/i18n/docs/updateinfo_it.txt @@ -0,0 +1,7 @@ +* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) +* Better refresh and sorting rules in transaction history +* Better handling of `invalid` transactions in history +* Better handling of wallets with 1K+ transactions in history +* Exports .csv files with transaction ID +* Better UTXOs selection polices +* Minor bug fixes diff --git a/i18n/docs/updateinfo_ja.txt b/i18n/docs/updateinfo_ja.txt new file mode 100644 index 000000000..53834a107 --- /dev/null +++ b/i18n/docs/updateinfo_ja.txt @@ -0,0 +1,7 @@ +■ 署名のできない、送金の提案のみできる閲覧専用のバックアップが作成できます。(詳細 https://github.com/bitpay/copay/pull/2998) +■ 取引履歴のソートとページ更新の品質向上 +■ 「無効」な取引の処理改善 +■ 1000個以上の取引履歴のあるウォレットの処理改善 +■ 取引のCSV出力可能 +■ 未使用出力(utxo)の選択ロジックの改善 +■ バグの修正 diff --git a/i18n/docs/updateinfo_pt.txt b/i18n/docs/updateinfo_pt.txt new file mode 100644 index 000000000..6cc35687a --- /dev/null +++ b/i18n/docs/updateinfo_pt.txt @@ -0,0 +1,7 @@ +* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) +* Better refresh and sorting rules in transaction history +* Better handling of `invalid` transactions in history +* Better handling of wallets with 1K+ transactions in history +* Exports .csv files with transaction ID +* Better UTXOs selection polices +* Minor bug fixes diff --git a/i18n/po/de.po b/i18n/po/de.po index 8f0d5e41f..e6c705eb8 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -2,30 +2,33 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Project-Id-Version: Copay\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: Sascha Dückers \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"X-Generator: Poedit 1.8.1\n" +"Project-Id-Version: copay\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: de\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: de\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83 \n" +"Language-Team: German\n" +"Language: de_DE\n" +"PO-Revision-Date: 2015-07-20 12:17-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(possible double spend)" #: public/views/modals/txp-details.html -msgid "" -"* Only payment proposals created by yourself with no peer actions can be " -"removed" -msgstr "" -"* Es können nur eigene Zahlungsvorschläge ohne Peer-Aktionen entfernt werden" +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 "* 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." #: public/views/backup.html -msgid "" -"* You can safely install your backup on another device and use your wallet " -"from multiple devices at the same time." -msgstr "" -"* Das Backup kann sicher auf anderen Geräten installiert und das Wallet von " -"mehreren Geräten gleichzeitig verwendet werden." +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* Das Backup kann sicher auf anderen Geräten installiert und das Wallet von mehreren Geräten gleichzeitig verwendet werden." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." #: public/views/splash.html msgid "A multisignature bitcoin wallet" @@ -43,7 +46,9 @@ msgstr "Akzeptieren" msgid "Add wallet" msgstr "Wallet hinzufügen" -#: public/views/paymentUri.html public/views/modals/paypro.html +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html msgid "Address" msgstr "Adresse" @@ -51,6 +56,10 @@ msgstr "Adresse" msgid "Advanced" msgstr "Erweitert" +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Agree" + #: public/views/preferencesAlias.html msgid "Alias for {{index.walletName}}" msgstr "Alias für {{index.walletName}}" @@ -63,12 +72,15 @@ msgstr "Existiert bereits ein Wallet?" msgid "Alternative Currency" msgstr "Alternative Währung" -#: public/views/paymentUri.html public/views/walletHome.html +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "Betrag" #: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Amount in" msgstr "Betrag in" @@ -76,7 +88,8 @@ msgstr "Betrag in" msgid "Applying changes" msgstr "Änderungen anwenden" -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "Are you sure you want to delete this wallet?" msgstr "Soll das Wallet wirklich gelöscht werden?" @@ -84,11 +97,13 @@ msgstr "Soll das Wallet wirklich gelöscht werden?" msgid "Available Balance" msgstr "Verfügbarer Gesamtbetrag" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "BIP32 master extended private key" msgstr "BIP32 erweiterter privater Hauptschlüssel" -#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Back" msgstr "Zurück" @@ -110,11 +125,12 @@ msgid "Backup options" msgstr "Sicherungseinstellungen" #: public/views/walletHome.html -msgid "" -"Before receiving funds, it is highly recommended you backup your wallet keys." -msgstr "" -"Bevor Beträge empfangen werden, wird dringend empfohlen die Wallet Schlüssel " -"zu sichern." +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "Bevor Beträge empfangen werden, wird dringend empfohlen die Wallet Schlüssel zu sichern." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Bitcoin Network Fee Policy" #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" @@ -124,6 +140,10 @@ msgstr "Bitcoin URI ist NICHT gültig!" msgid "Bitcoin address" msgstr "Bitcoinadresse" +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." + #: public/views/modals/txp-details.html msgid "Broadcast Payment" msgstr "Zahlung übermitteln" @@ -148,7 +168,8 @@ msgstr "Aber nicht übermittelt. Bitte manuelle Übermittlung versuchen" msgid "CANCEL" msgstr "ABBRUCH" -#: public/views/copayers.html public/views/walletHome.html +#: public/views/copayers.html +#: public/views/walletHome.html msgid "Cancel" msgstr "Abbruch" @@ -158,8 +179,7 @@ msgstr "Zertifiziert von" #: public/views/preferencesAlias.html msgid "Changing wallet alias only affects the local wallet name." -msgstr "" -"Änderung der Aliases hat nur Auswirkungen auf den lokalen Namen des Wallets" +msgstr "Änderung der Aliases hat nur Auswirkungen auf den lokalen Namen des Wallets" #: src/js/controllers/walletHome.js msgid "Check you connection and try again" @@ -169,8 +189,16 @@ msgstr "Bitte die Verbindung prüfen und erneut probieren" msgid "Choose a backup file from your computer" msgstr "Bitte eine Sicherungsdatei vom Computer wählen" -#: public/views/includes/topbar.html public/views/modals/copayers.html -#: public/views/modals/paypro.html public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Choose a wallet to send funds" + +#: public/views/includes/topbar.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html msgid "Close" msgstr "Schließen" @@ -204,29 +232,19 @@ msgstr "In die Zwischenablage kopieren" #: src/js/controllers/walletHome.js msgid "Could not accept payment. Check you connection and try again" -msgstr "" -"Zahlung konnte nicht angenommen werden. Bitte die Verbindung überprüfen und " -"erneut versuchen" +msgstr "Zahlung konnte nicht angenommen werden. Bitte die Verbindung überprüfen und erneut versuchen" #: src/js/controllers/walletHome.js msgid "Could not broadcast payment. Check you connection and try again" -msgstr "" -"Zahlung kann nicht übermittelt werden. Bitte die Verbindung prüfen und " -"erneut probieren" +msgstr "Zahlung kann nicht übermittelt werden. Bitte die Verbindung prüfen und erneut probieren" #: src/js/controllers/walletHome.js -msgid "" -"Could not connect wallet service. Check your Internet connexion and your " -"wallet service configuration." -msgstr "" -"Kann keine Verbindung zum Wallet Service aufgebaut werden. Bitte die " -"Internetverbindung und die Wallet Service Einstellung überprüfen." +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." +msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." #: src/js/controllers/walletHome.js msgid "Could not create address. Check you connection and try again" -msgstr "" -"Es kann keine Adresse erzeugt werden. Bitte Verbindung prüfen und erneut " -"versuchen" +msgstr "Es kann keine Adresse erzeugt werden. Bitte Verbindung prüfen und erneut versuchen" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -242,9 +260,7 @@ msgstr "Datei kann nicht entschlüsselt werden, bitte das Passwort überprüfen" #: src/js/controllers/walletHome.js msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "" -"Die Zahlungsanweisung kann nicht gelöscht werden. Bitte Verbindung prüfen " -"und erneut probieren" +msgstr "Die Zahlungsanweisung kann nicht gelöscht werden. Bitte Verbindung prüfen und erneut probieren" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -260,18 +276,19 @@ msgstr "Import nicht möglich. Bitte Datei und Passwort überprüfen" #: src/js/services/profileService.js msgid "Could not join using the specified extended private key" -msgstr "" -"Teilnahme mit spezifizierten erweiterten privaten Schlüssel nicht möglich" +msgstr "Teilnahme mit spezifizierten erweiterten privaten Schlüssel nicht möglich" #: src/js/controllers/join.js msgid "Could not join wallet:" msgstr "Beteiligung am Wallet nicht möglich" +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Could not recognize a valid Bitcoin QR Code" + #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" -msgstr "" -"Zahlung kann nicht abgelehnt werden. Bitte Verbindung prüfen und erneut " -"versuchen" +msgstr "Zahlung kann nicht abgelehnt werden. Bitte Verbindung prüfen und erneut versuchen" #: src/js/controllers/walletHome.js msgid "Could not send payment" @@ -286,6 +303,7 @@ msgid "Create" msgstr "Erzeugen" #: public/views/add.html +#: public/views/create.html msgid "Create new wallet" msgstr "Neues Wallet erzeugen" @@ -337,15 +355,29 @@ msgstr "Wallet löschen" msgid "Deleting payment" msgstr "Zahlung löschen" -#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Details" msgstr "Details" +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "Deutsch" + #: public/views/preferences.html msgid "Disabled" msgstr "Deaktiviert" +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Do not include private key in backup" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Download CSV file" + #: public/views/backup.html msgid "Download backup" msgstr "Download der Sicherung " @@ -354,10 +386,18 @@ msgstr "Download der Sicherung " msgid "ENTER" msgstr "ENTER" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Economy" + #: public/views/preferences.html msgid "Email Notifications" msgstr "Benachrichtigunen per E-Mail" +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "Emergency" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Verschlüsselung des privaten Schlüssels" @@ -386,10 +426,15 @@ msgstr "Fehler beim Erstellen des Wallets. Bitte die Internetverbindung prüfen" msgid "Error importing wallet:" msgstr "Fehler beim Import des Wallets" -#: public/views/modals/paypro.html public/views/modals/txp-details.html +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html msgid "Expires" msgstr "Gültig bis" +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Failed to create backup" + #: src/js/controllers/importLegacy.js msgid "Failed to import wallets" msgstr "Import des Wallets fehlgeschlagen" @@ -398,6 +443,11 @@ msgstr "Import des Wallets fehlgeschlagen" msgid "Family vacation funds" msgstr "Familienurlaub" +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Fee" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -415,19 +465,37 @@ msgstr "Beträge empfangen" msgid "GET STARTED" msgstr "JETZT STARTEN" +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Generate QR Code" + #: public/views/walletHome.html msgid "Generate new address" msgstr "Neue Adresse erzeugen" +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Generating .csv file..." + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Getting address for wallet {{selectedWalletName}} ..." + #: public/views/preferences.html msgid "Global settings" msgstr "Globale Einstellungen" +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Go back" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Ist eine Copay v0.9 Sicherung vorhanden" -#: public/views/create.html public/views/join.html +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html msgid "Hide Advanced options" msgstr "Erweiterte Optionen ausblenden" @@ -439,7 +507,12 @@ msgstr "Historie" msgid "Home" msgstr "Start" -#: public/views/create.html public/views/join.html +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "I affirm that I have read, understood, and agree with these terms." + +#: public/views/create.html +#: public/views/join.html msgid "If not given, a secure key will be generated" msgstr "Sofern nicht angegeben, wird ein sicherer Schlüssel erzeugt " @@ -447,7 +520,8 @@ msgstr "Sofern nicht angegeben, wird ein sicherer Schlüssel erzeugt " msgid "Import" msgstr "Import" -#: public/views/import.html public/views/splash.html +#: public/views/import.html +#: public/views/splash.html msgid "Import backup" msgstr "Importiere Sicherung" @@ -471,11 +545,16 @@ msgstr "Wallet wird importiert..." msgid "Importing..." msgstr "Importiere..." +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Invalid" + #: src/js/controllers/index.js msgid "Japanese" msgstr "日本語" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "John" msgstr "Sascha" @@ -503,12 +582,15 @@ msgstr "Mehr über die Migration von Wallets erfahren" msgid "Make a payment to" msgstr "Sende eine Zahlung an" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "Master extended private key" msgstr "Erweiterter privater Hauptschlüssel" -#: public/views/includes/copayers.html public/views/modals/copayers.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Me" msgstr "Ich" @@ -552,15 +634,25 @@ msgstr "Neue Zahlungsvorschlag" msgid "No" msgstr "Nein" +#: public/views/walletHome.html +msgid "No Private key" +msgstr "No Private key" + #: public/views/walletHome.html msgid "No transactions yet" msgstr "Noch keine Transaktionen" +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Normal" + #: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Not valid" msgstr "Nicht gültig" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Note" msgstr "Notiz" @@ -569,19 +661,19 @@ msgstr "Notiz" msgid "OKAY" msgstr "OKAY" -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Participants" msgstr "Teilnehmer" -#: public/views/import.html public/views/importLegacy.html +#: public/views/import.html +#: public/views/importLegacy.html msgid "Password" msgstr "Passwort" #: public/views/includes/password.html msgid "Password cannot be recovered. Be sure to write it down" -msgstr "" -"Passwort kann nicht wiederhergestellt werden. Bitte sicherheitshalber " -"notieren" +msgstr "Passwort kann nicht wiederhergestellt werden. Bitte sicherheitshalber notieren" #: src/js/services/profileService.js msgid "Password needed" @@ -639,7 +731,8 @@ msgstr "Zahlungsprotokoll wird nicht von der Chrome App unterstützt" msgid "Payment Rejected" msgstr "Zahlung abgelehnt" -#: public/views/modals/tx-status.html src/js/services/notificationsService.js +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js msgid "Payment Sent" msgstr "Zahlung gesendet" @@ -669,14 +762,14 @@ msgstr "Zahlung an" #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" -msgstr "" -"Wallet dauerhaft löschen. DIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN" +msgstr "Wallet dauerhaft löschen. DIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN" #: public/views/create.html msgid "Personal Wallet" msgstr "Persönliches Wallet" -#: src/js/controllers/create.js src/js/controllers/join.js +#: src/js/controllers/create.js +#: src/js/controllers/join.js msgid "Please enter the required fields" msgstr "Bitte die benötigten Felder ausfüllen" @@ -692,6 +785,14 @@ msgstr "Português" msgid "Preferences" msgstr "Einstellungen" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Priority" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "QR Code" + #: public/views/modals/scanner.html msgid "QR-Scanner" msgstr "QR-Scanner" @@ -728,11 +829,18 @@ msgstr "Zahlung ablehenen" msgid "Release Information" msgstr "Information zur Veröffentlichung" -#: public/views/backup.html public/views/includes/password.html +#: public/views/backup.html +#: public/views/includes/password.html msgid "Repeat password" msgstr "Passwort wiederholen" -#: public/views/import.html public/views/join.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Request a specific amount" + +#: public/views/import.html +#: public/views/join.html msgid "Required" msgstr "Benötigt" @@ -748,7 +856,8 @@ msgstr "EINRICHTEN" msgid "SKIP BACKUP" msgstr "SICHERUNG ÜBERSPRINGEN" -#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html #: public/views/preferencesEmail.html msgid "Save" msgstr "Speichern" @@ -793,12 +902,18 @@ msgstr "Bitte die benötigte Anzahl der Unterschriften wählen" msgid "Select total number of copayers" msgstr "Bitte die Gesamtanzahl der Copayer wählen" -#: public/views/walletHome.html public/views/includes/transaction.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html #: src/js/controllers/index.js msgid "Send" msgstr "Senden" -#: public/views/backup.html public/views/preferencesLogs.html +#: public/views/walletHome.html +msgid "Send All" +msgstr "Send All" + +#: public/views/backup.html +#: public/views/preferencesLogs.html msgid "Send by email" msgstr "Per E-Mail versenden" @@ -823,14 +938,8 @@ msgid "Set up a password" msgstr "Passwort einrichten" #: public/views/preferencesEmail.html -msgid "" -"Setting up email notifications could weaken your privacy, if the wallet " -"service provider is compromised. Information available to an attacker would " -"include your wallet addresses and its balance, but no more." -msgstr "" -"Das Einrichten einer E-Mail Benachrichtigung schwächt die Privatsphäre, wenn " -"der Wallet Service Anbieter kompromittiert wurde. Der Angreifer kann jedoch " -"nur Wallet Adresse und Guthaben erfahren, mehr nicht." +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Das Einrichten einer E-Mail Benachrichtigung schwächt die Privatsphäre, wenn der Wallet Service Anbieter kompromittiert wurde. Der Angreifer kann jedoch nur Wallet Adresse und Guthaben erfahren, mehr nicht." #: public/views/walletHome.html msgid "Share address" @@ -845,18 +954,16 @@ msgid "Share this invitation with your copayers" msgstr "Einladung mit Copayern teilen" #: public/views/walletHome.html -msgid "" -"Share this wallet address to receive payments. To protect your privacy, new " -"addresses are generated automatically once you use them." -msgstr "" -"Um Zahlungen zu empfangen, die hier angegebene Adresse teilen. Um die " -"Privatsphäre zu schützen wird nach jeder Nutzung eine neue Adresse erzeugt." +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Um Zahlungen zu empfangen, die hier angegebene Adresse teilen. Um die Privatsphäre zu schützen wird nach jeder Nutzung eine neue Adresse erzeugt." #: public/views/create.html msgid "Shared Wallet" msgstr "Wallet teilen" -#: public/views/create.html public/views/join.html +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html msgid "Show Advanced options" msgstr "Erweiterte Optionen anzeigen" @@ -872,7 +979,8 @@ msgstr "Transaktion unterschreiben" msgid "Spanish" msgstr "Español" -#: src/js/controllers/copayers.js src/js/controllers/import.js +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" msgstr "Erfolgreich" @@ -881,68 +989,68 @@ msgstr "Erfolgreich" msgid "Tap to retry" msgstr "Zum Wiederholen antippen" +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Terms of Use" + #: public/views/create.html msgid "Testnet" msgstr "Testnet" #: src/js/controllers/walletHome.js -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" +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" #: src/js/controllers/walletHome.js -msgid "" -"The payment was created but could not be signed. Please try again from home " -"screen." -msgstr "" -"Die Zahlung wurde erzeugt, kann aber nicht unterschrieben werden. Bitte " -"erneut über die Startseite versuchen" +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "Die Zahlung wurde erzeugt, kann aber nicht unterschrieben werden. Bitte erneut über die Startseite versuchen" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "Die Zahlung wurde vom Ersteller entfernt" #: src/js/controllers/walletHome.js -msgid "" -"The payment was signed but could not be broadcasted. Please try again from " -"home screen." -msgstr "" -"Die Zahlung wurde unterschrieben, kann aber nicht übertragen werden. Bitte " -"erneut über die Startseite versuchen" +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "Die Zahlung wurde unterschrieben, kann aber nicht übertragen werden. Bitte erneut über die Startseite versuchen" #: public/views/backup.html -msgid "" -"The private key for this wallet is encrypted. Exporting a backup will keep " -"the private key encrypted in the backup archive." -msgstr "" -"Der private Schlüssel für dieses Wallet ist verschlüsselt. Ein Export der " -"Sicherung behält diesen verschlüsselt im Sicherungsarchiv" +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "Der private Schlüssel für dieses Wallet ist verschlüsselt. Ein Export der Sicherung behält diesen verschlüsselt im Sicherungsarchiv" -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "Wallet \"{{walletName}}\" wurde gelöscht" +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "There are no wallets to make this payment" + #: src/js/controllers/import.js msgid "There is an error in the form" msgstr "Es ist ein Fehler im Formular aufgetreten" +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "This transaction has become invalid; possibly due to a double spend attempt." + #: public/views/walletHome.html -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" +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" #: public/views/modals/txp-details.html msgid "Time" msgstr "Zeit" -#: public/views/walletHome.html public/views/includes/transaction.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "To" msgstr "Zu" @@ -958,7 +1066,8 @@ msgstr "Transaktion" msgid "Unable to send transaction proposal" msgstr "Transaktionsvorschlag kann nicht gesendet werden" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html msgid "Unconfirmed" msgstr "Unbestätigt" @@ -1035,12 +1144,8 @@ msgid "Wallet name" msgstr "Name des Wallets" #: src/js/controllers/walletHome.js -msgid "" -"Wallet service timed out. Check your Internet connexion and your wallet " -"service configuration." -msgstr "" -"Walletdienst antwortet nicht. Bitte die Internetverbinung und Walletdienst " -"überprüfen." +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +msgstr "Wallet service timed out. Check your Internet connection and your wallet service configuration." #: public/views/preferencesDeleteWallet.html msgid "Warning!" @@ -1058,11 +1163,13 @@ msgstr "Ja" msgid "You do not have a wallet" msgstr "Kein Wallet vorhanden" -#: public/views/backup.html public/views/import.html +#: public/views/backup.html +#: public/views/import.html msgid "Your backup password" msgstr "Passwort zur Sicherung" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "Your nickname" msgstr "Name des Teilnehmers" @@ -1086,7 +1193,8 @@ msgstr "E-Mail für Wallet Benachrichtigungen" msgid "locked by pending payments" msgstr "durch ausstehende Zahlungen gesperrt" -#: public/views/copayers.html public/views/walletHome.html +#: public/views/copayers.html +#: public/views/walletHome.html #: public/views/includes/sidebar.html msgid "of" msgstr "von" @@ -1103,10 +1211,15 @@ msgstr "Einstellungen" msgid "too long!" msgstr "zu lang!" +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" +msgstr "{{fee.value}} bits per kB" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} will be discounted for bitcoin networking fees" + #: src/js/controllers/importLegacy.js -msgid "" -"{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " -"balance" -msgstr "" -"{{len}} Wallets importiert. Beträge werden gescannt. Bitte auf die " -"Aktualisierung des Gesamtsaldos warten" +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} Wallets importiert. Beträge werden gescannt. Bitte auf die Aktualisierung des Gesamtsaldos warten" + diff --git a/i18n/po/el.po b/i18n/po/el.po new file mode 100644 index 000000000..fd8dcd1ad --- /dev/null +++ b/i18n/po/el.po @@ -0,0 +1,1225 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: copay\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: el\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83 \n" +"Language-Team: Greek\n" +"Language: el_GR\n" +"PO-Revision-Date: 2015-07-20 12:17-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(πιθανό διπλό ξόδεμα)" + +#: public/views/modals/txp-details.html +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr "Μια πρόταση πληρωμής μπορεί να διαγραφεί εάν 1) είστε ο δημιουργός, και κανένας άλλος χρήστης του copay δεν έχει υπογράψει, ή 2) έχουν περάσει 24 ώρες απο την ώρα που η πρόταση δημιουργήθηκε." + +#: public/views/backup.html +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "Μπορείτε με ασφάλεια να εγκαταστήσετε το αντίγραφο ασφαλείας σας σε μια άλλη συσκευή και να χρησιμοποιήσετε το πορτοφόλι σας απο πολλαπλές συσκευές την ίδια στιγμή." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "Ένα αντίγραφο ασφαλείας χωρίς το ιδιωτικό κλειδί θα επιτρέψει στον χρήστη να δεί το υπόλοιπο του πορτοφολιού, τις συναλλαγές και να δημιουργήσει προτάσεις εξόδων. Μολονότι, δεν θα μπορεί να επιβεβαιώσει (υπογράψει) προτάσεις." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "Ένα πορτοφόλι bitcoin με δυνατότητα πολλαπλών υπογραφών" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "Σχετικά με το Copay" + +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Αποδοχή" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "Προσθήκη Πορτοφολιού" + +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +msgid "Address" +msgstr "Διεύθυνση" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "Για προχωρημένους" + +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Συμφωνώ" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Ψευδώνυμο για {{index.walletName}}" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Έχετε ήδη πορτοφόλι?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "Εναλλακτικό Νόμισμα" + +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +#: public/views/modals/txp-details.html +msgid "Amount" +msgstr "Ποσό" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Amount in" +msgstr "Ποσό εισόδου" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "Αποδοχή αλλαγών" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "Είσαι σίγουρος ότι θέλετε να διαγράψετε αυτό το πορτοφόλι?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "Διαθέσιμο Υπόλοιπο" + +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "Πρωτεύον ιδιωτικό κλειδί επέκτασης BIP32" + +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "Πίσω" + +#: public/views/preferences.html +msgid "Backup" +msgstr "Αντίγραφο Ασφαλείας" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Αντίγραφο Ασφαλείας δημιουργήθηκε" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "Πάρτε Αντίγραφο Ασφαλείας τώρα" + +#: public/views/backup.html +msgid "Backup options" +msgstr "Επιλογές Αντιγράφου Ασφαλείας" + +#: public/views/walletHome.html +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "Πρίν λάβετε χρήματα, προτέινεται ισχυρά να πάρετε αντίγραφο ασφαλείας των κλειδιών του πορτοφολιού σας." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Πολιτική Χρέωσης Δικτύου Bitcoin" + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "Το σύστημα Bitcoin URI δεν είναι έγκυρο!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "Διεύθυνση Bitcoin" + +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "Οι συναλλαγές με Bitcoin μπορεί να περιλαμβάνουν αμοιβή η οποία συλλέγεται απο τον εξορυκτή στο δίκτυο. Όσο μεγαλύτερη η αμοιβή τόσο μεγαλύτερο το κίνητρο του εξορυκτή να συμπεριλάβει την συναλλαγή στο μπλόκ των συναλλαγών. Το 'Επείγον' επίπεδο πρέπει να χρησιμοποιείται μόνο όταν υπάρχει συμφόρηση του δικτύου." + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Μετάδοση Πληρωμής" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Μεταδίδω την Πληρωμή" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Μεταδίδοντας την συναλλαγή" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "Ο πλοηγός δέν υποστηρίζεται" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "Αλλά δέν μεταδόθηκε. Προσπαθήστε να στείλετε χειροκίνητα" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "ΑΚΥΡΟ" + +#: public/views/copayers.html +#: public/views/walletHome.html +msgid "Cancel" +msgstr "Άκυρο" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Πιστοποιήθηκε από" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "Αλλάζοντας το ψευδώνυμο του πορτοφολιού επηρεάζει μόνο το τοπικό όνομα πορτοφολιού." + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "Ελέγξτε την συνδεσή σας και προσπαθήστε ξανά" + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "Επιλέξτε ένα αντίγραφο ασφαλείας απο τον υπολογιστή σας" + +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Επιλέξτε ένα πορτοφόλι για να στείλετε χρήματα" + +#: public/views/includes/topbar.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Close" +msgstr "Κλείσιμο" + +#: public/views/preferences.html +msgid "Color" +msgstr "Χρώμα" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Δέσμευση λύσης" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "Επιβεβαιώσεις" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Μέλη του πορτοφολιού Copay" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "Αποθηκεύστε το αντίγραφο ασφαλείας σε ασφαλές μέρος" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "Αντιγράψτε αυτο το κείμενο ώς έχει σε ασφαλές μέρος (σε εφαρμογή κειμένου ή ηλεκτρονικό ταχυδρομείο)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "Αντιγραφή στο πρόχειρο" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment. Check you connection and try again" +msgstr "Η πληρωμή δεν έγινε αποδεκτή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" +msgstr "Δεν μπορεί να αποσταλεί η πληρωμή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" + +#: src/js/controllers/walletHome.js +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." +msgstr "Δεν είναι δυνατή η σύνδεση στην υπηρεσία του πορτοφολιού. Ελέγξτε τη σύνδεσή σας και τη ρύθμιση παραμέτρων της υπηρεσίας του πορτοφολίου." + +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "Δεν είναι δυνατή η δημιουργία διεύθυνσης. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Δεν ήταν δυνατή η δημιουργία πρότασης πληρωμής" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Δεν ήταν δυνατή η δημιουργία χρησιμοποιώντας το συγκεκριμένο ιδιωτικό κλειδί επέκτασης" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση του αρχείου, ελέγξτε τον κωδικό σας" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal. Check you connection and try again" +msgstr "Δεν ήταν δυνατή η διαγραφή της πρότασης πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Δεν ήταν δυνατή η ανάκτηση των στοιχείων πληρωμής" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "Δεν ήταν δυνατή η λήψη του ιστορικού συναλλαγών" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "Δεν ήταν δυνατή η εισαγωγή. Ελέγξτε το αρχείο και τον κωδικό πρόσβασης" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "Δεν μπορείτε να συμμετέχετε χρησιμοποιώντας το συγκεκριμένο ιδιωτικό κλειδί επέκτασης" + +#: src/js/controllers/join.js +msgid "Could not join wallet:" +msgstr "Δεν μπορείτε να συμμετάσχετε στο πορτοφόλι:" + +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Δεν ήταν δυνατή η αναγνώριση ενός έγκυρου κωδικού QR για Βitcoin" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment. Check you connection and try again" +msgstr "Δεν είναι δυνατή η απόρριψη της πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Δεν είναι δυνατή η αποστολή της πληρωμής" + +#: public/views/walletHome.html +msgid "Could not update Wallet" +msgstr "Δεν ήταν δυνατή η ενημέρωση του πορτοφολιού" + +#: public/views/walletHome.html +msgid "Create" +msgstr "Δημιουργία" + +#: public/views/add.html +#: public/views/create.html +msgid "Create new wallet" +msgstr "Δημιουργήστε νέο πορτοφόλι" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Δημιουργία {{requiredCopayers}} των {{totalCopayers}} του πορτοφολιού" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "Δημιουργία, συμμετοχή ή εισαγωγή" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "Δημιουργήθηκε από" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Δημιουργία του Προφίλ..." + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "Δημιουργία του Πορτοφολιού..." + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Δημιουργία συναλλαγής" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "Ημερομηνία" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Διαγράψτε την Πρόταση Πληρωμής" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "Διαγραφή Πορτοφολιού" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Διαγράψετε το και δημιουργήστε ένα νέο" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Διαγραφή Πορτοφολιού" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Διαγραφή πληρωμής" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Λεπτομέρειες" + +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "Γερμανικά" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Απενεργοποιημένο" + +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Μην συμπεριλάβετε το ιδιωτικό κλειδί στο αντίγραφο ασφαλείας" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Κατεβάστε το αρχείο CSV" + +#: public/views/backup.html +msgid "Download backup" +msgstr "Λήψη αντιγράφου ασφαλείας" + +#: public/views/includes/password.html +msgid "ENTER" +msgstr "ΕΙΣΑΓΕΤΕ" + +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Οικονομία" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Ειδοποιήσεις Email" + +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "Έκτακτη Ανάγκη" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "Κρυπτογράφηση ιδιωτικού κλειδιού" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Κρυπτογραφημένο αρχείο αντιγράφου ασφαλείας αποθηκεύτηκε" + +#: src/js/controllers/index.js +msgid "English" +msgstr "Αγγλικά" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "Παρακαλώ εισάγετε τον κωδικό σας" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "Σφάλμα στην δημιουργία πορτοφολιού" + +#: src/js/services/profileService.js +msgid "Error creating wallet. Check your internet connection" +msgstr "Σφάλμα στην δημιουργία του πορτοφολιού. Ελέγξτε τη σύνδεσή σας στο internet" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "Σφάλμα στην εισαγωγή πορτοφολίου:" + +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html +msgid "Expires" +msgstr "Λήγει" + +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλείας" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Αποτυχία εισαγωγής πορτοφολιού" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "Χρήματα διακοπών της οικογένειας" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Αμοιβή" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Λήψη Πληροφοριών Πληρωμής" + +#: src/js/controllers/index.js +msgid "French" +msgstr "Γαλλικά" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Χρήματα ελήφθησαν" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "ΞΕΚΙΝΗΣΤΕ" + +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Δημιουργία Κώδικα QR" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "Δημιουργία νέας διεύθυνσης" + +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Δημιουργία .csv αρχείου..." + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Λήψη διεύθυνσης για το πορτοφόλι {{selectedWalletName}} ..." + +#: public/views/preferences.html +msgid "Global settings" +msgstr "Καθολικές ρυθμίσεις" + +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Πάμε πίσω" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Έχετε ένα αντίγραφο ασφαλείας από το Copay έκδοση 0.9?" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +msgid "Hide Advanced options" +msgstr "Απόκρυψη Προχωρημένων επιλογών" + +#: src/js/controllers/index.js +msgid "History" +msgstr "Ιστορικό" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Αρχική Σελίδα" + +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "Βεβαιώνω ότι έχω διαβάσει, κατανοήσει και συμφωνήσει με αυτούς τους όρους." + +#: public/views/create.html +#: public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "Αν δεν σας έχει δοθεί, ένα ασφαλές κλειδί θα δημιουργηθεί" + +#: public/views/importLegacy.html +msgid "Import" +msgstr "Εισαγωγή" + +#: public/views/import.html +#: public/views/splash.html +msgid "Import backup" +msgstr "Εισαγωγή αντιγράφου ασφαλείας" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "Εισαγωγή από το σύννεφο?" + +#: public/views/import.html +msgid "Import here" +msgstr "Εισαγωγή εδώ" + +#: public/views/add.html +msgid "Import wallet" +msgstr "Εισαγωγή πορτοφολιού" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "Εισάγεται το πορτοφόλι ..." + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "Εισαγωγή ..." + +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Μη έγκυρο" + +#: src/js/controllers/index.js +msgid "Japanese" +msgstr "Ιαπωνικά" + +#: public/views/create.html +#: public/views/join.html +msgid "John" +msgstr "Ιωάννης" + +#: public/views/join.html +msgid "Join" +msgstr "Συμμετοχή" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "Συμμετοχή σε κοινόχρηστο πορτοφόλι" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "Εισαγωγή στο Πορτοφόλι..." + +#: public/views/preferences.html +msgid "Language" +msgstr "Γλώσσα" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "Μάθετε περισσότερα για τη Μετανάστευση Πορτοφολιού" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Κάντε μια πληρωμή σε" + +#: public/views/create.html +#: public/views/join.html +msgid "Master extended private key" +msgstr "Πρωτεύον ιδιωτικό κλειδί επέκτασης" + +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Me" +msgstr "Εγώ" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Σημείωση" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Μήνυμα Εμπόρου" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "Μήνυμα" + +#: public/views/walletHome.html +msgid "More" +msgstr "Περισσότερα" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Μετακινήθηκε" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "Πορτοφόλι Πολλών Υπογραφών" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "Η διεύθυνση Bitcoin μου" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "Δίκτυο" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "Νέα Πρόταση Πληρωμής" + +#: public/views/modals/confirmation.html +msgid "No" +msgstr "Όχι" + +#: public/views/walletHome.html +msgid "No Private key" +msgstr "Δεν υπάρχει ιδιωτικό κλειδί" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "Δεν υπάρχουν συναλλαγές ακόμα" + +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Κανονική" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Not valid" +msgstr "Δεν είναι έγκυρη" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Note" +msgstr "Σημείωση" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "ΕΝΤΑΞΕΙ" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "Συμμετέχοντες" + +#: public/views/import.html +#: public/views/importLegacy.html +msgid "Password" +msgstr "Κωδικός πρόσβασης" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "Ο Κωδικός πρόσβασης δεν μπορεί να ανακτηθεί. Να είστε βέβαιος οτι τον σημειώσατε" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "Κωδικός πρόσβασης απαιτείται" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "Οι κωδικοί πρόσβασης δεν ταιριάζουν" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Επικολλήστε την πρόσκληση σας εδώ" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Επικολλήστε τον κώδικα δημιουργίας αντιγράφων ασφαλείας εδώ" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Πληρωμή Πρός" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Πληρωμή Αποδεκτή" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Πρόταση Πληρωμής" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Πρόταση Πληρωμής Δημιουργήθηκε" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Πρόταση Πληρωμής Απορρίφθηκε" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Το Copayer Απέρριψε την Πρόταση Πληρωμής" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Η Πρόταση Πληρωμής Υπογράφηκε από το Copayer" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Πρόταση Πληρωμής" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Το Πρωτόκολλο Πληρωμής δεν υποστηρίζεται στην εφαρμογή Chrome" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Πληρωμή Απερρίφθη" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Πληρωμή Εστάλη" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Πληρωμή αποδεκτή..." + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Λεπτομέρειες πληρωμής" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Η πληρωμή τελικά απορρίφθηκε" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Αίτηση πληρωμής" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Πληρωμή Εστάλη!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Πληρωμή σε" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "Να διαγράφεί μόνιμα αυτό το πορτοφόλι? ΑΥΤΗ Η ΕΝΕΡΓΕΙΑ ΔΕΝ ΜΠΟΡΕΙ ΝΑ ΑΝΤΙΣΤΡΑΦΕΙ" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Προσωπικό πορτοφόλι" + +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Παρακαλώ εισάγετε τα απαιτούμενα πεδία" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Παρακαλώ, επιλέξτε το αρχείο αντιγράφου ασφαλείας" + +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "Πορτογαλικά" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Προτιμήσεις" + +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Προτεραιότητα" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "Κωδικός QR" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "Σαρωτής QR" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Λάβετε" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Ληφθέντα" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Γίνεται επανασύνδεση στην Υπηρεσία Πορτοφολιού..." + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Αναδημιουργία" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Αναδημιουργία πορτοφολιού..." + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "Απόρριψη" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Απόρριψη πληρωμής" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Πληροφορίες Έκδοσης" + +#: public/views/backup.html +#: public/views/includes/password.html +msgid "Repeat password" +msgstr "Επανάληψη κωδικού" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Ζητήστε ένα συγκεκριμένο ποσό" + +#: public/views/import.html +#: public/views/join.html +msgid "Required" +msgstr "Απαιτείτε" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "Επανάληψη..." + +#: public/views/includes/password.html +msgid "SET" +msgstr "Ορισμός" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "ΠΑΡΑΛΕΙΨΗ ΔΗΜΙΟΥΡΓΙΑΣ ΑΝΤΙΓΡΑΦΩΝ ΑΣΦΑΛΕΙΑΣ" + +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Αποθήκευση" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Αποθήκευση προτιμήσεων..." + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Η σάρωση ολοκληρώθηκε" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Σάρωση διευθύνσεων για χρήματα" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "Η σάρωση έχει τελειώσει με σφάλματα" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Σάρωση χρημάτων Πορτοφολιού..." + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "Δείτε τη συναλλαγή στην αλυσίδα συναλλαγών" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "Επιλέξτε ένα αρχείο αντιγράφου ασφαλείας" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Επιλέξτε ένα πορτοφόλι" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Επιλέξτε τον απαιτούμενο αριθμό υπογραφών" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Επιλέξτε το συνολικό αριθμό των copayers" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Αποστολή" + +#: public/views/walletHome.html +msgid "Send All" +msgstr "Αποστολή Όλων" + +#: public/views/backup.html +#: public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Αποστολή με email" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Εξερχόμενα" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "Διακομιστής" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Ημερολόγιο συνεδριών" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "Ορίστε έναν Κωδικό Πρόσβασης για το αντίγραφο ασφαλείας" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "Ορίστε έναν κωδικό πρόσβασης" + +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Ενεργοποιώντας τις ενημερώσεις μέσω ηλεκτρονικού ταχυδρομείου μπορεί να μειωθεί η ιδιωτικότητα σας, εάν ο πάροχος του πορτοφολιού παραβιαστεί. Οι πληροφορίες που θα διαθέτει ένας εισβολέας θα περιλαμβάνουν τις διευθύνσεις του πορτοφόλιου σας και το ποσόν των χρημάτων σας, αλλά τίποτα περισσότερο." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Μοιραστείτε τη διεύθυνση" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Μοιραστείτε μια πρόσκληση" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Μοιραστείτε αυτήν την πρόσκληση με άλλους copayers" + +#: public/views/walletHome.html +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Μοιραστείτε αυτή τη διεύθυνση πορτοφόλιού ώστε να λάβετε πληρωμές. Για την προστασία της ιδιωτικότητας σας, νέες διευθύνσεις δημιουργούνται αυτόματα μόλις χρησιμοποιήσετε τις παλιές." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Κοινόχρηστο πορτοφόλι" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +msgid "Show Advanced options" +msgstr "Εμφάνιση προχωρημένων επιλογών" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Υπογραφή πληρωμής" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Υπογραφή συναλλαγής" + +#: src/js/controllers/index.js +msgid "Spanish" +msgstr "Ισπανικά" + +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Επιτυχία" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Πατήστε για να προσπαθήσετε ξανά" + +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Όροι Χρήσης" + +#: public/views/create.html +msgid "Testnet" +msgstr "Δοκιμαστικό Δίκτυο" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be completed. Please try again from home screen" +msgstr "Η πληρωμή δημιουργήθηκε, αλλά δεν ήταν δυνατό να ολοκληρωθεί. Παρακαλώ ξαναπροσπαθήστε από την αρχική οθόνη" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "Η πληρωμή δημιουργήθηκε, αλλά δεν θα μπορούσε να υπογραφεί. Παρακαλώ ξαναπροσπαθήστε από την αρχική οθόνη." + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "Η πληρωμή έχει αφαιρεθεί από τον δημιουργό της" + +#: src/js/controllers/walletHome.js +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "Η πληρωμή έχει υπογραφεί αλλά δεν μπορούσε να μεταδοθεί. Παρακαλώ ξαναπροσπαθήστε από την αρχική οθόνη." + +#: public/views/backup.html +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "Το ιδιωτικό κλειδί για αυτό το πορτοφόλι είναι κρυπτογραφημένο. Εξάγωντας ένα αντίγραφο ασφαλείας θα κρατήθει το ιδιωτικό κλειδί που έχει κρυπτογραφηθεί στο εφεδρικό αρχείο." + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "Το λογισμικό που πρόκειται να χρησιμοποιήσετε λειτουργεί ως ένα δωρεάν, ανοικτού κώδικα και πολλαπλών υπογραφών ψηφιακό πορτοφόλι. Το λογισμικό δεν αποτελεί ένα λογαριασμό όπου το BitPay ή άλλα τρίτα μέρη χρησιμεύουν ως ενδιάμεσοι χρηματοπιστωτικοί οργανισμοί ή θεματοφύλακες των bitcoin σας. Ενώ το λογισμικό έχει υποβληθεί σε δοκιμή beta και συνεχίζει να βελτιώνεται από χρήστες ανοικτού κώδικα και την κοινότητα των προγραμματιστών, εμείς δεν μπορούμε να εγγυηθούμε ότι δεν θα υπάρξει κανένα σφάλμα στο λογισμικό. Αναγνωρίζετε ότι η χρήση αυτού του λογισμικού είναι στην κρίση σας και σε συμφωνία με όλους τους ισχύοντες νόμους. Είστε υπεύθυνος για τη διαφύλαξή των κωδικών πρόσβασής σας, το ιδιωτικό ζεύγος κλειδιών, τετραψήφιων κωδικών PIN και οποιουσδήποτε άλλους κωδικούς που χρησιμοποιείτε για να έχετε πρόσβαση στο λογισμικό. ΕΑΝ ΧΑΣΕΤΕ ΤΗΝ ΠΡΟΣΒΑΣΗ ΝΑ ΣΑΣ ΣΤΟ ΠΟΡΤΟΦΌΛΙ COPAY Ή ΣΤΑ ΚΡΥΠΤΟΓΡΑΦΗΜΕΝΑ ΙΔΙΩΤΙΚΑ ΣΑΣ ΚΛΕΙΔΙΑ ΚΑΙ ΔΕΝ ΑΠΟΘΗΚΕΥΣΑΤΕ ΧΩΡΙΣΤΆ ΕΝΑ ΑΝΤΙΓΡΑΦΟ ΑΣΦΑΛΕΙΑΣ ΤΟΥ ΠΟΡΤΟΦΟΛΙΟΥ ΚΑΙ ΤΟΥ ΑΝΤΙΣΤΟΙΧΟΥ ΚΩΔΙΚΟΥ ΠΡΌΣΒΑΣΗΣ, ΑΠΟΔΕΧΕΣΤΕ ΚΑΙ ΣΥΜΦΩΝΕΙΤΕ ΟΤΙ ΟΠΟΙΑΔΗΠΟΤΕ ΠΟΣΟΤΗΤΑ BITCOIN ΠΟΥ ΕΧΕΤΕ ΣΥΣΧΕΤΙΣΕΙ ΜΕ ΤΟ ΠΟΡΤΟΦΟΛΙ ΤΟΥ COPAY ΘΑ ΓΙΝΟΥΝ ΑΠΡΟΣΠΕΛΑΣΤΑ. Όλες οι αιτήσεις για συναλλαγές είναι αμετάκλητες. Οι συγγραφείς του λογισμικού, οι εργαζόμενοι και οι συνεργάτες του Bitpay, οι κατόχοι πνευματικών δικαιωμάτων, και η BitPay α.ε., δεν μπορούν να ανακτήσουν ιδιωτικά κλειδιά ή τους κωδικούς πρόσβασης σας, εάν χάσετε ή ξεχασετε αυτούς και δεν μπορούν να εγγυηθούν την επιβεβαίωση της συναλλαγής, δεδομένου ότι δεν έχουν τον έλεγχο του δικτύου Bitcoin. Στο μέγιστο βαθμό που επιτρέπει το δίκαιο, το λογισμικό παρέχεται \"ως έχει\" και καμία δήλωση ή εγγύηση μπορεί να γίνει του κάθε είδους, ρητή ή σιωπηρή, συμπεριλαμβανομένων, αλλά μη περιορισμένων, των εγγυήσεων εμπορευσιμότητας, καταλληλότητας ή συγκεκριμένου σκοπού και νομιμότητας. Αναλάμβανετε κάθε κινδύνο που συνδέεται με τη χρήση του λογισμικού. Σε καμία περίπτωση οι συντάκτες του λογισμικού, οι συνεργάτες του Bitpay, οι κατόχοι πνευματικών δικαιωμάτων, ή η BitPay α.ε. ευθύνεται για οποιαδήποτε αξίωση, ζημία ή άλλη ευθύνη, είτε βαση κάποιας σύμβασης, αδικοπραξίας, ή άλλο, που προκύπτει από την σχέση σας με το λογισμικό. Διατηρούμε το δικαίωμα να τροποποιήσουμε αυτή την αποποίηση ευθυνών από καιρό σε καιρό." + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "Διαγράφηκε το πορτοφόλι \"{{walletName}}\"" + +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "Δεν υπάρχουν πορτοφόλια για να πραγματοποιηθεί η πληρωμή" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "Υπάρχει ένα λάθος στη φόρμα εισαγωγής" + +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "Αυτή η συναλλαγή είναι άκυρη, πιθανόν λόγω μιας προσπάθειας διπλού ξοδέματος." + +#: public/views/walletHome.html +msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." +msgstr "Το πορτοφόλι δεν έχει καταχωρηθεί στη Βάση Δεδομένων Πορτοφολιών Bitcore (BWS). Μπορείτε να την ξαναδημιουργήσετε από τις τοπικές πληροφορίες." + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "Ώρα" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "To" +msgstr "Προς" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Συνολικό Κλειδωμένο Υπόλοιπο" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Συναλλαγή" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Δεν είναι δυνατή η αποστολή πρότασης συναλλαγής" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Ανεπιβεβαίωτες" + +#: public/views/preferences.html +msgid "Unit" +msgstr "Μονάδα" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Μη Απεσταλμένες συναλλαγές" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Μη αξιόπιστη" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Ενημέρωση πορτοφολιού..." + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Έκδοση" + +#: public/views/backup.html +msgid "View backup" +msgstr "Προβολή αντιγράφων ασφαλείας" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "Προειδοποίηση: Δημιουργία αντιγράφων ασφαλείας απαιτείται" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "Προειδοποίηση: Το πορτοφόλι δεν έχει καταχωρηθεί" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "ΚΑΛΩΣ ΗΛΘΑΤΕ ΣΤΟ COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "Αναμονή για copayers" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "Σε αναμονή..." + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Ψευδώνυμο Πορτοφολιού" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "Το Πορτοφόλι έχει ήδη εισαχθεί:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "Πρόσκληση πορτοφολιού" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "Η πρόσκληση πορτοφολιού δεν είναι έγκυρη!" + +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "Υπάρχει ήδη το πορτοφόλι" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Πορτοφόλι ελλιπές και χαλασμένο" + +#: public/views/create.html +msgid "Wallet name" +msgstr "Όνομα πορτοφολιού" + +#: src/js/controllers/walletHome.js +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +msgstr "Η υπηρεσία πορτοφολιού έληξε. Ελέγξτε τη συνδεσή σας και τη ρύθμιση των παραμέτρων του πορτοφολιού σας." + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "Προειδοποίηση!" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "Λάθος κωδικός πρόσβασης" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Ναι" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "Δεν έχετε πορτοφόλι" + +#: public/views/backup.html +#: public/views/import.html +msgid "Your backup password" +msgstr "Ο κωδικός πρόσβασης των αντιγράφων ασφαλείας σας" + +#: public/views/create.html +#: public/views/join.html +msgid "Your nickname" +msgstr "Το ψευδώνυμό σας" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "Ο κωδικός σας" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "Ο κωδικός πρόσβασης του προφίλ σας" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Το πορτοφόλι σας έχει εισαχθεί σωστά" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "Το ηλεκτρονικό σας ταχυδρομείο για τις ειδοποιήσεις του πορτοφόλιού σας" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "κλειδωμένο από εκκρεμούσες πληρωμές" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/includes/sidebar.html +msgid "of" +msgstr "από" + +#: public/views/walletHome.html +msgid "optional" +msgstr "προαιρετικό" + +#: public/views/preferences.html +msgid "settings" +msgstr "ρυθμίσεις" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "πάρα πολύ μεγάλο μέγεθος!" + +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" +msgstr "{{fee.value}} bits ανά kB" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}}, θα προεξοφληθεί ώς τέλος του δικτύου bitcoin" + +#: src/js/controllers/importLegacy.js +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} τα πορτοφόλια εισάχθηκαν. Σάρωση χρημάτων σε εξέλιξη. Περιμένετε για να δείτε το τελικό σας υπόλοιπο" + diff --git a/i18n/po/es.po b/i18n/po/es.po index 38c3a13ca..ecc400bf4 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -1,48 +1,34 @@ msgid "" msgstr "" -"Project-Id-Version: Copay\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"Language: es\n" -"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.10\n" +"Project-Id-Version: copay\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: es-ES\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83 \n" +"Language-Team: Spanish\n" +"Language: es_ES\n" +"PO-Revision-Date: 2015-07-20 12:17-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" msgstr "(Posible doble gasto)" #: public/views/modals/txp-details.html -msgid "" -"* A payment proposal can be deleted if 1) you are the creator, and no other " -"copayer has signed, or 2) 24 hours have passed since the proposal was " -"created." -msgstr "" -"* Una propuesta de pago puede ser eliminada si 1) Ud. es el creador, y " -"ningún otro copayer la ha firmado, o 2) han transcurrido 24 horas desde la " -"creación de la propuesta." +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr "* Una propuesta de pago puede ser eliminada si 1) Ud. es el creador, y ningún otro copayer la ha firmado, o 2) han transcurrido 24 horas desde la creación de la propuesta." #: public/views/backup.html -msgid "" -"* You can safely install your backup on another device and use your wallet " -"from multiple devices at the same time." -msgstr "" -"* Usted puede instalar la copia de seguridad en otro dispositivo y usar el " -"monedero al mismo tiempo en varios dispositivos." +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* Usted puede instalar la copia de seguridad en otro dispositivo y usar el monedero al mismo tiempo en varios dispositivos." #: public/views/backup.html -msgid "" -"A backup without its private key will allow the user to see the wallet " -"balance, transactions, and create spend proposals. However, it will not be " -"able to approve (sign) proposals." -msgstr "" -"Una copia de seguridad sin la clave privada permitirá al usuario ver el " -"balance del monedero, las transacciones y crear propuestas de gasto. Sin " -"embargo, no podrá aprobar (firmar) propuestas." +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "Una copia de seguridad sin la clave privada permitirá al usuario ver el balance del monedero, las transacciones y crear propuestas de gasto. Sin embargo, no podrá aprobar (firmar) propuestas." #: public/views/splash.html msgid "A multisignature bitcoin wallet" @@ -60,7 +46,8 @@ msgstr "Aceptar" msgid "Add wallet" msgstr "Agregar monedero" -#: public/views/paymentUri.html public/views/modals/customized-amount.html +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html #: public/views/modals/paypro.html msgid "Address" msgstr "Dirección" @@ -85,13 +72,15 @@ msgstr "¿Ya dispone de un monedero?" msgid "Alternative Currency" msgstr "Moneda Alternativa" -#: public/views/paymentUri.html public/views/walletHome.html +#: public/views/paymentUri.html +#: public/views/walletHome.html #: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "Importe" -#: public/views/walletHome.html public/views/modals/customized-amount.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Amount in" msgstr "Importe en" @@ -99,7 +88,8 @@ msgstr "Importe en" msgid "Applying changes" msgstr "Aplicando los cambios" -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "Are you sure you want to delete this wallet?" msgstr "¿Estas seguro de borrar este monedero?" @@ -107,11 +97,13 @@ msgstr "¿Estas seguro de borrar este monedero?" msgid "Available Balance" msgstr "Balance disponible" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "BIP32 master extended private key" msgstr "BIP32 master extended private key" -#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Back" msgstr "Volver" @@ -133,11 +125,8 @@ msgid "Backup options" msgstr "Opciones de copia de seguridad" #: public/views/walletHome.html -msgid "" -"Before receiving funds, it is highly recommended you backup your wallet keys." -msgstr "" -"Antes de recibir fondos, es altamente recomendable realizar una copia de " -"seguridad." +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "Antes de recibir fondos, es altamente recomendable realizar una copia de seguridad." #: public/views/preferences.html msgid "Bitcoin Network Fee Policy" @@ -152,16 +141,8 @@ msgid "Bitcoin address" msgstr "Dirección bitcoin" #: public/views/preferencesFee.html -msgid "" -"Bitcoin transactions may include a fee collected by miners on the network. " -"The higher the fee, the greater the incentive a miner has to include that " -"transaction in a block. The ‘Emergency’ level should only be used when there " -"is a network congestion." -msgstr "" -"Las transacciones de Bitcoin pueden incluir una tasa que es recaudada por " -"los mineros de la red. Cuanto mayor sea la tasa, mayor será el incentivo de " -"los mineros para incluir esa transacción en un bloque. El nivel 'Emergencia' " -"debe ser utilizado solo cuando hay una congestión en la red." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "Las transacciones de Bitcoin pueden incluir una tasa que es recaudada por los mineros de la red. Cuanto mayor sea la tasa, mayor será el incentivo de los mineros para incluir esa transacción en un bloque. El nivel 'Emergencia' debe ser utilizado solo cuando hay una congestión en la red." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -187,7 +168,8 @@ msgstr "Pero no transmitida. Inténtelo manualmente" msgid "CANCEL" msgstr "CANCELAR" -#: public/views/copayers.html public/views/walletHome.html +#: public/views/copayers.html +#: public/views/walletHome.html msgid "Cancel" msgstr "Cancelar" @@ -197,8 +179,7 @@ msgstr "Certificado por" #: public/views/preferencesAlias.html msgid "Changing wallet alias only affects the local wallet name." -msgstr "" -"Cambiar el alias del monedero solo afecta al nombre del monedero local." +msgstr "Cambiar el alias del monedero solo afecta al nombre del monedero local." #: src/js/controllers/walletHome.js msgid "Check you connection and try again" @@ -212,9 +193,12 @@ msgstr "Seleccione el archivo backup de su computadora" msgid "Choose a wallet to send funds" msgstr "Seleccione un monedero para enviar fondos" -#: public/views/includes/topbar.html public/views/modals/copayers.html -#: public/views/modals/customized-amount.html public/views/modals/paypro.html -#: public/views/modals/scanner.html public/views/modals/wallets.html +#: public/views/includes/topbar.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html msgid "Close" msgstr "Cerrar" @@ -240,9 +224,7 @@ msgstr "Guardar copia de seguridad en un lugar seguro" #: public/views/backup.html msgid "Copy this text as it is to a safe place (notepad or email)" -msgstr "" -"Copiar el texto como esta en un lugar seguro (bloc de notas o correo " -"electrónico)" +msgstr "Copiar el texto como esta en un lugar seguro (bloc de notas o correo electrónico)" #: public/views/backup.html msgid "Copy to clipboard" @@ -250,26 +232,19 @@ msgstr "Copiar al portapapeles" #: src/js/controllers/walletHome.js msgid "Could not accept payment. Check you connection and try again" -msgstr "" -"No se pudo aceptar el pago. Verifique su conexión e inténtelo nuevamente" +msgstr "No se pudo aceptar el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js msgid "Could not broadcast payment. Check you connection and try again" -msgstr "" -"No se pudo emitir el pago. Verifique su conexión e inténtelo nuevamente" +msgstr "No se pudo emitir el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js -msgid "" -"Could not connect wallet service. Check your Internet connexion and your " -"wallet service configuration." -msgstr "" -"No se pudo conectar con Wallet Service. Verifique la conexión a internet y " -"la configuración a Wallet Service." +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." +msgstr "No se pudo conectar con Wallet Service. Verifique la conexión a internet y la configuración a Wallet Service." #: src/js/controllers/walletHome.js msgid "Could not create address. Check you connection and try again" -msgstr "" -"No se pudo crear la dirección. Verifique su conexión e inténtelo nuevamente" +msgstr "No se pudo crear la dirección. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -285,9 +260,7 @@ msgstr "No se pudo desencriptar el archivo, verifique su contraseña" #: src/js/controllers/walletHome.js msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "" -"No se pudo eliminar la propuesta de pago. Verifique su conexión e inténtelo " -"nuevamente" +msgstr "No se pudo eliminar la propuesta de pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -315,8 +288,7 @@ msgstr "No se reconoció un código QR de Bitcoin válido" #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" -msgstr "" -"No se pudo rechazar el pago. Verifique su conexión e inténtelo nuevamente" +msgstr "No se pudo rechazar el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js msgid "Could not send payment" @@ -330,7 +302,8 @@ msgstr "No se puede actualizar el monedero" msgid "Create" msgstr "Crear" -#: public/views/add.html public/views/create.html +#: public/views/add.html +#: public/views/create.html msgid "Create new wallet" msgstr "Crear nuevo monedero" @@ -382,8 +355,10 @@ msgstr "Eliminar monedero" msgid "Deleting payment" msgstr "Eliminando el Pago" -#: public/views/modals/customized-amount.html public/views/modals/paypro.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Details" msgstr "Detalles" @@ -451,7 +426,8 @@ msgstr "Error al crear monedero. Verifique su conexión a internet" msgid "Error importing wallet:" msgstr "Error al importar monedero: " -#: public/views/modals/paypro.html public/views/modals/txp-details.html +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html msgid "Expires" msgstr "Expira" @@ -467,6 +443,7 @@ msgstr "Falló al importar monederos" msgid "Family vacation funds" msgstr "Fondos para vacaciones en familia" +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Fee" msgstr "Costo" @@ -516,7 +493,9 @@ msgstr "Volver" msgid "Have a Backup from Copay v0.9?" msgstr "¿Tiene una copia de seguridad de Copay v0.9?" -#: public/views/backup.html public/views/create.html public/views/join.html +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html msgid "Hide Advanced options" msgstr "Ocultar opciones avanzadas" @@ -532,7 +511,8 @@ msgstr "Inicio" msgid "I affirm that I have read, understood, and agree with these terms." msgstr "Confirmo haber leído, entendido y aceptado estos términos." -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "If not given, a secure key will be generated" msgstr "Si no se ingresa, una clave segura será generada" @@ -540,7 +520,8 @@ msgstr "Si no se ingresa, una clave segura será generada" msgid "Import" msgstr "Importar" -#: public/views/import.html public/views/splash.html +#: public/views/import.html +#: public/views/splash.html msgid "Import backup" msgstr "Importar copia de seguridad" @@ -572,7 +553,8 @@ msgstr "Inválido" msgid "Japanese" msgstr "Japonés" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "John" msgstr "Juan" @@ -600,12 +582,15 @@ msgstr "Más detalles para migrar Monedero" msgid "Make a payment to" msgstr "Hacer un pago a" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "Master extended private key" msgstr "Master extended private key" -#: public/views/includes/copayers.html public/views/modals/copayers.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Me" msgstr "Yo" @@ -661,11 +646,13 @@ msgstr "Sin transacciones todavía" msgid "Normal" msgstr "Normal" -#: public/views/walletHome.html public/views/modals/customized-amount.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Not valid" msgstr "No válido" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Note" msgstr "Nota" @@ -674,19 +661,19 @@ msgstr "Nota" msgid "OKAY" msgstr "LISTO" -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Participants" msgstr "Participantes" -#: public/views/import.html public/views/importLegacy.html +#: public/views/import.html +#: public/views/importLegacy.html msgid "Password" msgstr "Contraseña" #: public/views/includes/password.html msgid "Password cannot be recovered. Be sure to write it down" -msgstr "" -"La contraseña no se puede recuperar. Asegúrese de escribirla en un lugar " -"seguro" +msgstr "La contraseña no se puede recuperar. Asegúrese de escribirla en un lugar seguro" #: src/js/services/profileService.js msgid "Password needed" @@ -744,7 +731,8 @@ msgstr "El protocolo de pago no está soportado en Chrome" msgid "Payment Rejected" msgstr "El pago fue rechazado" -#: public/views/modals/tx-status.html src/js/services/notificationsService.js +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js msgid "Payment Sent" msgstr "Pago Enviado" @@ -774,14 +762,14 @@ msgstr "Pago a" #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" -msgstr "" -"Borrar permanentemente este monedero. ESTA ACCIÓN NO PUEDE SER REVERTIDA" +msgstr "Borrar permanentemente este monedero. ESTA ACCIÓN NO PUEDE SER REVERTIDA" #: public/views/create.html msgid "Personal Wallet" msgstr "Monedero Personal" -#: src/js/controllers/create.js src/js/controllers/join.js +#: src/js/controllers/create.js +#: src/js/controllers/join.js msgid "Please enter the required fields" msgstr "Por favor ingrese los campos requeridos" @@ -841,15 +829,18 @@ msgstr "Rechazando pago" msgid "Release Information" msgstr "Información de la versión" -#: public/views/backup.html public/views/includes/password.html +#: public/views/backup.html +#: public/views/includes/password.html msgid "Repeat password" msgstr "Repite la contraseña" -#: public/views/walletHome.html public/views/modals/customized-amount.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Request a specific amount" msgstr "Solicitar una cantidad específica" -#: public/views/import.html public/views/join.html +#: public/views/import.html +#: public/views/join.html msgid "Required" msgstr "Requerido" @@ -865,7 +856,8 @@ msgstr "ESTABLECER" msgid "SKIP BACKUP" msgstr "OMITIR" -#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html #: public/views/preferencesEmail.html msgid "Save" msgstr "Guardar" @@ -910,7 +902,8 @@ msgstr "Seleccione el número de firmas requeridas" msgid "Select total number of copayers" msgstr "Seleccione el total de copayers" -#: public/views/walletHome.html public/views/includes/transaction.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html #: src/js/controllers/index.js msgid "Send" msgstr "Enviar" @@ -919,7 +912,8 @@ msgstr "Enviar" msgid "Send All" msgstr "Enviar Todo" -#: public/views/backup.html public/views/preferencesLogs.html +#: public/views/backup.html +#: public/views/preferencesLogs.html msgid "Send by email" msgstr "Enviar por correo electrónico" @@ -944,15 +938,8 @@ msgid "Set up a password" msgstr "Configure una contraseña" #: public/views/preferencesEmail.html -msgid "" -"Setting up email notifications could weaken your privacy, if the wallet " -"service provider is compromised. Information available to an attacker would " -"include your wallet addresses and its balance, but no more." -msgstr "" -"Configurar notificaciones por correo electrónico podría debilitar su " -"privacidad, si el proveedor de servicio se ve comprometido. Información " -"disponible para un atacante incluiría sus direcciones de cartera y su " -"balance, pero no más." +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Configurar notificaciones por correo electrónico podría debilitar su privacidad, si el proveedor de servicio se ve comprometido. Información disponible para un atacante incluiría sus direcciones de cartera y su balance, pero no más." #: public/views/walletHome.html msgid "Share address" @@ -967,18 +954,16 @@ msgid "Share this invitation with your copayers" msgstr "Comparta esta invitación con sus copayers" #: public/views/walletHome.html -msgid "" -"Share this wallet address to receive payments. To protect your privacy, new " -"addresses are generated automatically once you use them." -msgstr "" -"Compartir esta dirección para recibir pagos. Para proteger su privacidad, se " -"generan nuevas direcciones automáticamente luego de recibir un pago." +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Compartir esta dirección para recibir pagos. Para proteger su privacidad, se generan nuevas direcciones automáticamente luego de recibir un pago." #: public/views/create.html msgid "Shared Wallet" msgstr "Monedero Compartido" -#: public/views/backup.html public/views/create.html public/views/join.html +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html msgid "Show Advanced options" msgstr "Mostrar opciones avanzadas" @@ -994,7 +979,8 @@ msgstr "Firmando transacción" msgid "Spanish" msgstr "Español" -#: src/js/controllers/copayers.js src/js/controllers/import.js +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" msgstr "Listo" @@ -1003,7 +989,8 @@ msgstr "Listo" msgid "Tap to retry" msgstr "Toque para reintentar" -#: public/views/disclaimer.html public/views/preferencesAbout.html +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html msgid "Terms of Use" msgstr "Términos de Uso" @@ -1012,129 +999,31 @@ msgid "Testnet" msgstr "Testnet" #: src/js/controllers/walletHome.js -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 intente nuevamente " -"desde la pantalla de inicio." +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 intente nuevamente desde la pantalla de inicio." #: src/js/controllers/walletHome.js -msgid "" -"The payment was created but could not be signed. Please try again from home " -"screen." -msgstr "" -"El pago fue creado pero no pudo ser firmado. Por favor intente nuevamente " -"desde la pantalla de inicio." +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "El pago fue creado pero no pudo ser firmado. Por favor intente nuevamente desde la pantalla de inicio." #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "El pago fue eliminado por el creador" #: src/js/controllers/walletHome.js -msgid "" -"The payment was signed but could not be broadcasted. Please try again from " -"home screen." -msgstr "" -"El pago fue firmado pero no pudo ser enviado. Por favor intente nuevamente " -"desde la pantalla de inicio." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "El pago fue firmado pero no pudo ser enviado. Por favor intente nuevamente desde la pantalla de inicio." #: public/views/backup.html -msgid "" -"The private key for this wallet is encrypted. Exporting a backup will keep " -"the private key encrypted in the backup archive." -msgstr "" -"Este monedero tiene sus claves privadas encriptadas. Exportar una copia de " -"seguridad mantendrá la clave privada encriptada en la copia de seguridad." +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "Este monedero tiene sus claves privadas encriptadas. Exportar una copia de seguridad mantendrá la clave privada encriptada en la copia de seguridad." #: public/views/disclaimer.html -msgid "" -"The software you are about to use functions as a free, open source, and " -"multi-signature digital wallet. The software does not constitute an account " -"where BitPay or other third parties serve as financial intermediaries or " -"custodians of your bitcoin. While the software has undergone beta testing " -"and continues to be improved by feedback from the open-source user and " -"developer community, we cannot guarantee that there will be no bugs in the " -"software. You acknowledge that your use of this software is at your own " -"discretion and in compliance with all applicable laws. You are responsible " -"for safekeeping your passwords, private key pairs, PINs and any other codes " -"you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR " -"YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF " -"YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY " -"BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME " -"INACCESSIBLE. All transaction requests are irreversible. The authors of the " -"software, employees and affiliates of Bitpay, copyright holders, and BitPay, " -"Inc. cannot retrieve your private keys or passwords if you lose or forget " -"them and cannot guarantee transaction confirmation as they do not have " -"control over the Bitcoin network. To the fullest extent permitted by law, " -"this software is provided “as is” and no representations or warranties can " -"be made of any kind, express or implied, including but not limited to the " -"warranties of merchantability, fitness or a particular purpose and " -"noninfringement. You assume any and all risks associated with the use of the " -"software. In no event shall the authors of the software, employees and " -"affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for " -"any claim, damages or other liability, whether in an action of contract, " -"tort, or otherwise, arising from, out of or in connection with the software. " -"We reserve the right to modify this disclaimer from time to time." -msgstr "" -"El software que va a utilizar es un monedero digital de código abierto y " -"multi-firmas. El software no constituye una cuenta donde BitPay u otras " -"terceras partes sirven como intermediarios financieros o custodios de su " -"bitcoin. Mientras que el software ha sido objeto de pruebas beta y continúa " -"siendo mejorada por los comentarios de los usuarios de código abierto y la " -"comunidad de desarrolladores, no podemos garantizar que no habrá errores en " -"el software. Usted reconoce que el uso de este software es bajo tu propia " -"responsabilidad y en cumplimiento con todas las leyes aplicables. Usted es " -"responsable de la custodia de sus contraseñas, pares de claves privadas, PIN " -"y cualquier otro código que se utiliza para acceder al software. SI UD. " -"PIERDE ACCESO A SU MONEDERO COPAY O A SUS CLAVES PRIVADAS ENCRIPTADAS Y NO " -"HA GUARDADO POR SEPARADO UNA COPIA DE SEGURIDAD DE SU MONEDERO Y CONTRASEÑA " -"CORRESPONDIENTES, USTED RECONOCE Y ACEPTA QUE CUALQUIER BITCOIN QUE HA " -"ASOCIADO CON ESE MONEDERO COPAY SERÁ INACCESIBLE. Todas las solicitudes de " -"transacción son irreversibles. Los autores de los software, empleados y " -"afiliados de Bitpay, los titulares de derechos de autor, y BitPay, Inc. no " -"pueden recuperar sus claves privadas o contraseñas si se pierde o se olvida " -"de ellos y no se puede garantizar la confirmación de la transacción, ya que " -"no tienen control sobre la red Bitcoin. En la máxima medida permitida por la " -"ley, este software se proporciona \"tal cual\" y no asume la responsabilidad " -"ni ofrece garantías de ningún tipo, expresa o implícita, incluyendo, pero no " -"limitado a las garantías comerciales, de conveniencia o a un propósito " -"particular. Usted asume todos los riesgos asociados con el uso del software. " -"En ningún caso los autores, empleados y afiliados de Bitpay, los titulares " -"de derechos de autor, o BitPay, Inc. serán declarados responsables de los " -"reclamos, daños o cualquier otra responsabilidad, ya sea en una acción de " -"contrato, agravio o de otra manera, que surja fuera de la conexión con el " -"software. Nos reservamos el derecho a modificar el presente aviso legal de " -"vez en cuando.

    The software you are about to use functions as a free, " -"open source, and multi-signature digital wallet. The software does not " -"constitute an account where BitPay or other third parties serve as financial " -"intermediaries or custodians of your bitcoin. While the software has " -"undergone beta testing and continues to be improved by feedback from the " -"open-source user and developer community, we cannot guarantee that there " -"will be no bugs in the software. You acknowledge that your use of this " -"software is at your own discretion and in compliance with all applicable " -"laws. You are responsible for safekeeping your passwords, private key pairs, " -"PINs and any other codes you use to access the software. IF YOU LOSE ACCESS " -"TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT " -"SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU " -"ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY " -"WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. " -"The authors of the software, employees and affiliates of Bitpay, copyright " -"holders, and BitPay, Inc. cannot retrieve your private keys or passwords if " -"you lose or forget them and cannot guarantee transaction confirmation as " -"they do not have control over the Bitcoin network. To the fullest extent " -"permitted by law, this software is provided “as is” and no representations " -"or warranties can be made of any kind, express or implied, including but not " -"limited to the warranties of merchantability, fitness or a particular " -"purpose and noninfringement. You assume any and all risks associated with " -"the use of the software. In no event shall the authors of the software, " -"employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be " -"held liable for any claim, damages or other liability, whether in an action " -"of contract, tort, or otherwise, arising from, out of or in connection with " -"the software. We reserve the right to modify this disclaimer from time to " -"time." +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "El software que va a utilizar es un monedero digital de código abierto y multi-firmas. El software no constituye una cuenta donde BitPay u otras terceras partes sirven como intermediarios financieros o custodios de su bitcoin. Mientras que el software ha sido objeto de pruebas beta y continúa siendo mejorada por los comentarios de los usuarios de código abierto y la comunidad de desarrolladores, no podemos garantizar que no habrá errores en el software. Usted reconoce que el uso de este software es bajo tu propia responsabilidad y en cumplimiento con todas las leyes aplicables. Usted es responsable de la custodia de sus contraseñas, pares de claves privadas, PIN y cualquier otro código que se utiliza para acceder al software. SI UD. PIERDE ACCESO A SU MONEDERO COPAY O A SUS CLAVES PRIVADAS ENCRIPTADAS Y NO HA GUARDADO POR SEPARADO UNA COPIA DE SEGURIDAD DE SU MONEDERO Y CONTRASEÑA CORRESPONDIENTES, USTED RECONOCE Y ACEPTA QUE CUALQUIER BITCOIN QUE HA ASOCIADO CON ESE MONEDERO COPAY SERÁ INACCESIBLE. Todas las solicitudes de transacción son irreversibles. Los autores de los software, empleados y afiliados de Bitpay, los titulares de derechos de autor, y BitPay, Inc. no pueden recuperar sus claves privadas o contraseñas si se pierde o se olvida de ellos y no se puede garantizar la confirmación de la transacción, ya que no tienen control sobre la red Bitcoin. En la máxima medida permitida por la ley, este software se proporciona \"tal cual\" y no asume la responsabilidad ni ofrece garantías de ningún tipo, expresa o implícita, incluyendo, pero no limitado a las garantías comerciales, de conveniencia o a un propósito particular. Usted asume todos los riesgos asociados con el uso del software. En ningún caso los autores, empleados y afiliados de Bitpay, los titulares de derechos de autor, o BitPay, Inc. serán declarados responsables de los reclamos, daños o cualquier otra responsabilidad, ya sea en una acción de contrato, agravio o de otra manera, que surja fuera de la conexión con el software. Nos reservamos el derecho a modificar el presente aviso legal de vez en cuando.

    The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "El monedero \"{{walletName}}\" fue eliminado" @@ -1147,26 +1036,21 @@ msgid "There is an error in the form" msgstr "Hay un error en el formulario" #: public/views/modals/tx-details.html -msgid "" -"This transaction has become invalid; possibly due to a double spend attempt." -msgstr "" -"Esta transacción se ha invalidado; posiblemente debido a un intento de doble " -"gasto." +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "Esta transacción se ha invalidado; posiblemente debido a un intento de doble gasto." #: public/views/walletHome.html -msgid "" -"This wallet is not registered at the given Bitcore Wallet Service (BWS). You " -"can recreate it from the local information." -msgstr "" -"Este monedero no esta registrado en el servidor Bitcore Wallet Service " -"(BWS). Debe recrearlo con la información local disponible." +msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." +msgstr "Este monedero no esta registrado en el servidor Bitcore Wallet Service (BWS). Debe recrearlo con la información local disponible." #: public/views/modals/txp-details.html msgid "Time" msgstr "Hora" -#: public/views/walletHome.html public/views/includes/transaction.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "To" msgstr "Para" @@ -1182,7 +1066,8 @@ msgstr "Transacción" msgid "Unable to send transaction proposal" msgstr "No se puede enviar propuesta de transacción" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html msgid "Unconfirmed" msgstr "Sin confirmar" @@ -1259,12 +1144,8 @@ msgid "Wallet name" msgstr "Nombre del monedero" #: src/js/controllers/walletHome.js -msgid "" -"Wallet service timed out. Check your Internet connexion and your wallet " -"service configuration." -msgstr "" -"Tiempo de espera agotado. Verifique la conexión a internet y la " -"configuración a Wallet Service." +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +msgstr "Tiempo de espera agotado. Verifique la conexión a internet y la configuración a Wallet Service." #: public/views/preferencesDeleteWallet.html msgid "Warning!" @@ -1282,11 +1163,13 @@ msgstr "Si" msgid "You do not have a wallet" msgstr "No tienes ningún monedero" -#: public/views/backup.html public/views/import.html +#: public/views/backup.html +#: public/views/import.html msgid "Your backup password" msgstr "Tu contraseña" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "Your nickname" msgstr "Tu sobrenombre" @@ -1310,7 +1193,8 @@ msgstr "email para recibir notificaciones" msgid "locked by pending payments" msgstr "bloqueado por pagos pendientes" -#: public/views/copayers.html public/views/walletHome.html +#: public/views/copayers.html +#: public/views/walletHome.html #: public/views/includes/sidebar.html msgid "of" msgstr "de" @@ -1336,854 +1220,6 @@ msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} se descontarán de los costos de la red bitcoin" #: src/js/controllers/importLegacy.js -msgid "" -"{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " -"balance" -msgstr "" -"{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el " -"balance actualizado" +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el balance actualizado" -#~ msgid "Receive a customized amount" -#~ msgstr "Recibir un monto personalizado" - -#~ msgid "" -#~ "* Only payment proposals created by yourself with no peer actions can be " -#~ "removed" -#~ msgstr "" -#~ "* Solo transacciones creadas por Usted mismo sin haber realizado acciones " -#~ "por otros usuarios, pueden ser eliminadas" - -#~ msgid "Alias for" -#~ msgstr "Alias para" - -#~ msgid "Hide" -#~ msgstr "Ocultar" - -#~ msgid "If not given, a random key will be generated" -#~ msgstr "Si no se ingresa, una clave aleatoria será generada" - -#~ msgid "Show" -#~ msgstr "Mostrar" - -#~ msgid "wallet" -#~ msgstr "monedero" - -#~ msgid "Transaction not broadcasted. Please try again." -#~ msgstr "Transacción no emitida. Por favor, intente nuevamente." - -#~ msgid "Could not sign transaction. Please try again." -#~ msgstr "No se pudo firmar la transacción. Por favor, intente nuevamente." - -#~ msgid "Payment Proposal Sent" -#~ msgstr "Propuesta de Pago Enviada" - -#~ msgid "Use test network" -#~ msgstr "Red de prueba" - -#~ msgid "A transaction was finally rejected" -#~ msgstr "Transacción finalmente rechazada" - -#~ msgid "Import from Copay Beta 0.9" -#~ msgstr "Importar de Copay Beta 0.9" - -#~ msgid "Information" -#~ msgstr "Información" - -#~ msgid "New Transaction" -#~ msgstr "Nueva Transacción" - -#~ msgid "Remove transaction" -#~ msgstr "Elimine la transacción" - -#~ msgid "Sign" -#~ msgstr "Firmar" - -#~ msgid "Signatures" -#~ msgstr "Firmas" - -#~ msgid "Spend proposals" -#~ msgstr "Propuestas de gastos" - -#~ msgid "Transaction Rejected" -#~ msgstr "Transacción Rechazada" - -#~ msgid "Transaction Sent" -#~ msgstr "Transacción Enviada" - -#~ msgid "Transaction Signed" -#~ msgstr "Transacción Firmada" - -#~ msgid "Transaction broadcasted" -#~ msgstr "Transacción enviada" - -#~ msgid "Transaction proposal" -#~ msgstr "Propuestas de transacción" - -#~ msgid "Transaction proposal signed" -#~ msgstr "Propuesta de transacción firmada" - -#~ msgid "Transaction sent!" -#~ msgstr "¡Transacción enviada!" - -#~ msgid "Transaction was rejected" -#~ msgstr "Transacción rechazada" - -#~ msgid "Transaction not rejected. Please try again." -#~ msgstr "Transacción no rechazada. Por favor, intente nuevamente." - -#~ msgid "Transaction not signed. Please try again." -#~ msgstr "Transacción no firmada. Por favor, intente nuevamente." - -#~ msgid "" -#~ "* In case you need to import wallets from previous Copay versions go to " -#~ "Menu" -#~ msgstr "" -#~ "* En caso que necesite importar monederos de una versión anterior de " -#~ "Copay, diríjase al Menú" - -#~ msgid "About" -#~ msgstr "Acerca de" - -#~ msgid "Delete" -#~ msgstr "Eliminar" - -#~ msgid "Import legacy wallet" -#~ msgstr "Importar monedero obsoleto" - -#~ msgid "Logs" -#~ msgstr "Registros" - -#~ msgid "" -#~ "Permanently delete this wallet. WARNING: this action cannot be reversed." -#~ msgstr "" -#~ "Borrar permanentemente este monedero. ADVERTENCIA: esta acción no puede " -#~ "deshacerse." - -#~ msgid "OK" -#~ msgstr "LISTO" - -#~ msgid "Copied to clipboard" -#~ msgstr "Copiado al portapapeles" - -#~ msgid "Preparing backup..." -#~ msgstr "Preparando copia de seguridad..." - -#~ msgid "Loading..." -#~ msgstr "Cargando..." - -#~ msgid "No pending spend proposals at the moment." -#~ msgstr "No hay gastos pendientes en este momento." - -#~ msgid "Joining shared wallet..." -#~ msgstr "Unirse a un monedero..." - -#~ msgid "Trying to reconnnect..." -#~ msgstr "Intentando reconectar..." - -#~ msgid "Updating Pending Transactions..." -#~ msgstr "Actualizando Transacciones Pendientes..." - -#~ msgid "Updating Status..." -#~ msgstr "Actualizando Estado..." - -#~ msgid "Wallet Service Error" -#~ msgstr "Error en Wallet Service" - -#~ msgid "To:" -#~ msgstr "Para:" - -#~ msgid "Add" -#~ msgstr "Agregar" - -#~ msgid "Add a new entry" -#~ msgstr "Nueva Entrada" - -#~ msgid "Add entry" -#~ msgstr "Nueva Entrada" - -#~ msgid "Address Book" -#~ msgstr "Libreta de Direcciones" - -#~ msgid "Creator" -#~ msgstr "Creador" - -#~ msgid "Date:" -#~ msgstr "Fecha:" - -#~ msgid "Empty. Create an alias for your addresses" -#~ msgstr "Vacío. Crea una etiqueta para tus direcciones" - -#~ msgid "Entry" -#~ msgstr "Entrada" - -#~ msgid "Label" -#~ msgstr "Etiqueta" - -#~ msgid "Note:" -#~ msgstr "Nota:" - -#~ msgid "Skip" -#~ msgstr "Omitir" - -#~ msgid "Visible" -#~ msgstr "Visible" - -#~ msgid "change" -#~ msgstr "vuelto" - -#~ msgid "Bitcore Wallet Service URL" -#~ msgstr "Bitcore Wallet Service URL" - -#~ msgid "Repeat Password" -#~ msgstr "Repita la contraseña" - -#~ msgid "* Using this device storage. Change to cloud storage on 'settings'." -#~ msgstr "" -#~ "* Utilizando este dispositivo para guardar. Cambiar a almacenamiento en " -#~ "la nube desde 'preferencias'." - -#~ msgid "-- choose wallet --" -#~ msgstr "-- Seleccionar monedero --" - -#~ msgid "A transaction was signed by" -#~ msgstr "Una transacción fue firmada por" - -#~ msgid "" -#~ "ALL Transactions Proposals will be discarded. This needs to be done on " -#~ "ALL peers of a wallet, to prevent the old proposals to be resynced " -#~ "again." -#~ msgstr "" -#~ "TODAS las Propuestas de Transacciones serán descartadas. Es necesario que " -#~ "lo hagan TODOS los compañeros del monedero, para prevenir que las " -#~ "viejas propuestas sean re sincronizadas de nuevo." - -#~ msgid "Access your wallets anywhere" -#~ msgstr "Acceder a sus monederos en cualquier lugar" - -#~ msgid "Accessing your profile" -#~ msgstr "Abriendo tu perfil" - -#~ msgid "Add Wallet" -#~ msgstr "Agregar Monedero" - -#~ msgid "Add a private comment to identify the transaction" -#~ msgstr "Agregar comentario privado para identificar la transacción" - -#~ msgid "An email was sent to" -#~ msgstr "Se envió un correo electrónico a" - -#~ msgid "Aprox. size:" -#~ msgstr "Tamaño aprox.:" - -#~ msgid "Are you sure you want to cancel and delete this wallet" -#~ msgstr "¿Estas seguro de cancelar y borrar este monedero?" - -#~ msgid "Are you sure you want to delete this profile?" -#~ msgstr "¿Estas seguro de borrar este perfil?" - -#~ msgid "Backups managed by the server" -#~ msgstr "Copias de seguridad gestionada por el servidor" - -#~ msgid "Balance:" -#~ msgstr "Balance:" - -#~ msgid "Choose a password" -#~ msgstr "Escribe una contraseña" - -#~ msgid "Confirm your email address" -#~ msgstr "Confirmar tu correo electrónico" - -#~ msgid "Confirm your email address to increase storage usage limits." -#~ msgstr "" -#~ "Confirmar correo electrónico para incrementar el límite de almacenamiento." - -#~ msgid "Continue anyways" -#~ msgstr "Continuar de todas maneras" - -#~ msgid "Copay now needs a profile to access wallets." -#~ msgstr "Copay ahora requiere un perfil para acceder a los monederos" - -#~ msgid "Create in the cloud" -#~ msgstr "Crear en la nube" - -#~ msgid "Create on this device" -#~ msgstr "Crear en este dispositivo" - -#~ msgid "Create profile" -#~ msgstr "Crear perfil" - -#~ msgid "Creating in the cloud" -#~ msgstr "Creando en la nube" - -#~ msgid "Creating on this device" -#~ msgstr "Creando en este dispositivo" - -#~ msgid "Delete Profile" -#~ msgstr "Borrar Perfil" - -#~ msgid "Disclaimer" -#~ msgstr "Renuncia" - -#~ msgid "Email" -#~ msgstr "Correo electrónico" - -#~ msgid "Email address confirmation needed" -#~ msgstr "Confirmar correo electrónico" - -#~ msgid "Email not confirmed" -#~ msgstr "Correo sin confirmar" - -#~ msgid "Enter PIN" -#~ msgstr "Ingresar PIN" - -#~ msgid "Error updating indexes:" -#~ msgstr "Error al actualizar índices:" - -#~ msgid "Fatal error connecting to Insight server" -#~ msgstr "Error fatal al conectar con el servidor Insight" - -#~ msgid "Form Error" -#~ msgstr "Error en formulario" - -#~ msgid "Hide them" -#~ msgstr "Ocultar" - -#~ msgid "Import a backup" -#~ msgstr "Importar una copia de seguridad" - -#~ msgid "Importing wallet - Reading backup..." -#~ msgstr "Importando monedero - Leyendo archivo..." - -#~ msgid "Importing wallet - Setting things up..." -#~ msgstr "Importando monedero - Configurando..." - -#~ msgid "Importing wallet - We are almost there..." -#~ msgstr "Importando monedero - Finalizando..." - -#~ msgid "Insight API server" -#~ msgstr "Servidor de Insight API" - -#~ msgid "" -#~ "Insight API server is open-source software. You can run your own " -#~ "instances, check" -#~ msgstr "" -#~ "Servidor de Insight API es un software código-abierto. Puedes correr tu " -#~ "propia instancia en Insight API Homepage" - -#~ msgid "It's important that you update your wallet at https://copay.io" -#~ msgstr "Es importante que actualices tu monedero en https://copay.io" - -#~ msgid "" -#~ "It's important to backup your profile so that you can recover it in case " -#~ "of disaster. The backup will include all your profile's wallets" -#~ msgstr "" -#~ "Es importante hacer copia de seguridad de tu monedero para que puedas " -#~ "recuperarlo en caso de pérdidas de datos de tu computadora" - -#~ msgid "Join Secret" -#~ msgstr "Ingresar Secreto" - -#~ msgid "Leave a private message to your copayers" -#~ msgstr "Dejar mensaje privado a tus compañeros" - -#~ msgid "Leave feedback" -#~ msgstr "Dejar comentarios" - -#~ msgid "Lock" -#~ msgstr "Bloquear" - -#~ msgid "Log level" -#~ msgstr "Nivel de registro" - -#~ msgid "" -#~ "Log level shows information on the console. This is useful to find bugs " -#~ "and to help users. 'debug' is the most verbose level while 'fatal' only " -#~ "shows unexpected errors" -#~ msgstr "" -#~ "Nivel de registro muestra información de la consola. Esto es útil para " -#~ "encontrar errores y ayudar a los usuarios. 'debug' es el nivel más " -#~ "detallado, mientras que 'mortal' sólo muestra errores inesperados" - -#~ msgid "Login Required" -#~ msgstr "Inicio de Sesión Requerido" - -#~ msgid "More pluggins are welcomed!" -#~ msgstr "¡Más extensiones son bienvenidas!" - -#~ msgid "My Profile" -#~ msgstr "Mi Perfil" - -#~ msgid "Name:" -#~ msgstr "Nombre:" - -#~ msgid "Needs Backup" -#~ msgstr "Copia de Seguridad necesaria" - -#~ msgid "Networking Error" -#~ msgstr "Error de Red" - -#~ msgid "New entry has been created" -#~ msgstr "Nueva entrada fue creada" - -#~ msgid "Next" -#~ msgstr "Siguiente" - -#~ msgid "No email required" -#~ msgstr "Correo electrónico no es requerido" - -#~ msgid "On this Device" -#~ msgstr "En este dispositivo" - -#~ msgid "" -#~ "Opening the wallet in multiple browser tabs could lead to unexpected " -#~ "results" -#~ msgstr "" -#~ "Abrir el monedero en varias ventanas del mismo navegador podría conducir " -#~ "a resultados inesperados" - -#~ msgid "Page not found" -#~ msgstr "Página no encontrada" - -#~ msgid "Paste wallet secret here" -#~ msgstr "Pegar código secreto del monedero aquí" - -#~ msgid "" -#~ "Pending Transactions Proposals will be discarded. This needs to be done " -#~ "on ALL peers of a wallet, to prevent the old proposals to be " -#~ "resynced again." -#~ msgstr "" -#~ "Las Propuestas de Transacciones Pendientes serán descartadas. Esto es " -#~ "necesario hacerlo con TODOS los compañeros del monedero, para " -#~ "prevenir que viejas propuestas sean re sincronizadas de nuevo." - -#~ msgid "" -#~ "Permanently delete this profile and all its wallets. WARNING: this action " -#~ "cannot be reversed." -#~ msgstr "" -#~ "Borrar permanentemente este perfil y sus monederos. ADVERTENCIA: esta " -#~ "acción no puede deshacerse." - -#~ msgid "Please complete required fields" -#~ msgstr "Por favor complete los campos requeridos" - -#~ msgid "" -#~ "Please confirm your email address using the confirmation link at the " -#~ "message we sent you" -#~ msgstr "" -#~ "Por favor confirma tu correo electrónico usando el enlace de este mensaje" - -#~ msgid "" -#~ "Please follow the link on it to confirm it. Unconfirmed profiles could be " -#~ "deleted from server." -#~ msgstr "" -#~ "Por favor sigue el enlace para confirmar. Perfiles sin confirmar podrían " -#~ "ser eliminados del servidor." - -#~ msgid "" -#~ "Please note the wallet creator must be online until all copayers " -#~ "have joined." -#~ msgstr "" -#~ "Por favor note que el creador del monedero debe estar conectado " -#~ "hasta que todos los compañeros se hayan unido." - -#~ msgid "Please open wallet to complete payment" -#~ msgstr "Por favor abrir un monedero para completar el pago" - -#~ msgid "Please sign in to access your wallets" -#~ msgstr "Por favor ingresa para ver tus monederos" - -#~ msgid "Please sign in to make the payment" -#~ msgstr "Por favor ingresa para completar el pago" - -#~ msgid "Please update your wallet at https://copay.io" -#~ msgstr "Por favor actualiza tu monedero de https://copay.io" - -#~ msgid "Profile" -#~ msgstr "Perfil" - -#~ msgid "Purge" -#~ msgstr "Purgar" - -#~ msgid "Purge ALL Transaction Proposals" -#~ msgstr "Purgar TODAS las Propuestas de Transacciones" - -#~ msgid "Purge All" -#~ msgstr "Purgar Todo" - -#~ msgid "Purge Pending Transaction Proposals" -#~ msgstr "Purgar Propuestas de Transacciones Pendientes" - -#~ msgid "Read and Store Profiles:" -#~ msgstr "Leer y guardar perfiles:" - -#~ msgid "Received corrupt message from" -#~ msgstr "Se recibió un mensaje corrupto de" - -#~ msgid "Received corrupt transaction from" -#~ msgstr "Se recibió una transacción corrupta de" - -#~ msgid "Recommended" -#~ msgstr "Recomendado" - -#~ msgid "Repeat PIN" -#~ msgstr "Repetir PIN" - -#~ msgid "Require pin to unlock" -#~ msgstr "Requiere PIN para desbloquear" - -#~ msgid "Scan" -#~ msgstr "Explorar" - -#~ msgid "Scaning for transactions" -#~ msgstr "Explorando transacciones" - -#~ msgid "Session closed because a long time of inactivity" -#~ msgstr "La sesión fue cerrada por mucho tiempo de inactividad" - -#~ msgid "Session will be closed" -#~ msgstr "La sesión se cerrará" - -#~ msgid "Share secret" -#~ msgstr "Compartir código secreto" - -#~ msgid "Show all my addresses" -#~ msgstr "Mostrar todas mis direcciones" - -#~ msgid "Sign in" -#~ msgstr "Ingresar" - -#~ msgid "Skip public keys" -#~ msgstr "Ignorar claves pública" - -#~ msgid "Skip transaction proposals" -#~ msgstr "Ignorar propuestas de transacciones" - -#~ msgid "Skipping fields: {{skipFields}}" -#~ msgstr "Saltear campos: {{skipFields}}" - -#~ msgid "Status:" -#~ msgstr "Estado:" - -#~ msgid "Storage" -#~ msgstr "Almacenamiento" - -#~ msgid "The balance is updated using the derived addresses" -#~ msgstr "El balance es actualizado utilizando direcciones derivadas" - -#~ msgid "The secret string you entered is invalid" -#~ msgstr "La palabra secreta ingresada no es válida" - -#~ msgid "The transaction proposal has been created" -#~ msgstr "La propuesta de transacción fue creada" - -#~ msgid "There was an error sending the transaction" -#~ msgstr "Hubo un error al enviar la transacción" - -#~ msgid "There was an error signing the transaction" -#~ msgstr "Hubo un error al firmar la transacción" - -#~ msgid "" -#~ "This is the initial secret join string. Since your wallet it is already " -#~ "complete, this is only useful to rejoin peers that lost their backup BUT " -#~ "have the extended private key stored (they will be rejected on other " -#~ "case). They need to enter their extended private key during the join " -#~ "process (in advanced options)." -#~ msgstr "" -#~ "Esta es el secreto para unirse. Desde la cartera ya está completa, esto " -#~ "sólo es útil para reunirse con sus compañeros que perdieron su respaldo " -#~ "pero tienen la extended private key almacenada (serán rechazadas en otro " -#~ "caso). Necesitan ingresar su extended private key durante el proceso de " -#~ "ingresar (en opciones avanzadas)." - -#~ msgid "This wallet appears to be currently open." -#~ msgstr "Este monedero parece estar actualmente abierto." - -#~ msgid "" -#~ "This will scan the blockchain looking for addresses derived from your " -#~ "wallet, in case you have funds in addresses not yet generated (e.g.: you " -#~ "restored an old backup). This will also trigger a synchronization of " -#~ "addresses to other connected peers." -#~ msgstr "" -#~ "Esto verificará la blockchain buscando direcciones derivadas de tu " -#~ "monedero, en caso de tener fondo en direcciones que no fueron generadas " -#~ "aún (por ej.: si restauraste una copia de seguridad antigua). Esto " -#~ "también activará la sincronización de direcciones a los demás compañeros " -#~ "conectados." - -#~ msgid "Transaction Error" -#~ msgstr "Error en Transacción" - -#~ msgid "Transactions Proposals Purged" -#~ msgstr "Propuestas de Transacciones Purgadas" - -#~ msgid "Type:" -#~ msgstr "Tipo:" - -#~ msgid "Username" -#~ msgstr "Nombre de usuario" - -#~ msgid "Using derived addresses from your wallet" -#~ msgstr "Usando direcciones derivadas de tu monedero" - -#~ msgid "Using network:" -#~ msgstr "Utilizando red:" - -#~ msgid "View My Profile" -#~ msgstr "Ver Mi Perfil" - -#~ msgid "Wallet info" -#~ msgstr "Información del monedero" - -#~ msgid "Wallet network configuration missmatch" -#~ msgstr "Configuración de la Red del monedero no coinciden" - -#~ msgid "" -#~ "Wallets and profiles are stored encrypted using your password as a key. " -#~ "You can store the encrypted data locally, on this device, or remotely on " -#~ "the cloud (Insight Server)." -#~ msgstr "" -#~ "Monederos y perfiles son almacenados encriptados utilizando tu " -#~ "contraseña. Puedes guardar los datos encriptados en tu dispositivo o " -#~ "remotamente en la nube (Servidor Insight)." - -#~ msgid "You can import your current wallets after" -#~ msgstr "Puedes importar tus monederos después" - -#~ msgid "You have" -#~ msgstr "Tienes" - -#~ msgid "You have a pending transaction proposal" -#~ msgstr "Tienes una propuesta de transacción pendiente" - -#~ msgid "You have old wallets in your localStorage. Choose one to import" -#~ msgstr "Tienes monederos locales antiguos. Selecciona para importar" - -#~ msgid "You rejected the transaction successfully" -#~ msgstr "Rechazaste la transacción con éxito" - -#~ msgid "" -#~ "Your current server usage quotas are: {{perItem}}kB per wallet and " -#~ "up to {{nrWallets}} wallets." -#~ msgstr "" -#~ "Actual uso de cuotas: {{perItem}}kB por monedero y hasta " -#~ "{{nrWallets}} monederos permitidos." - -#~ msgid "Your email was confimed!" -#~ msgstr "¡Tu correo electrónico fue confirmado!" - -#~ msgid "" -#~ "Your master private key contains the information to sign any " -#~ "transaction on this wallet. Handle with care." -#~ msgstr "" -#~ "Tu \"master private key\" contiene la información para firmar " -#~ "cualquier transacción de este monedero. Tenga cuidado al usar." - -#~ msgid "Your private keys never leave this device" -#~ msgstr "Tus claves privadas nunca dejan este dispositivo" - -#~ msgid "Your session is about to expire due to inactivity in" -#~ msgstr "Tu sesión está va a expirar por inactividad en" - -#~ msgid "" -#~ "Your session is about to expire due to inactivity in {{countdown}} seconds" -#~ msgstr "" -#~ "Tu sesión actual va a expirar por inactividad en {{countdown}} segundos" - -#~ msgid "Your wallet password" -#~ msgstr "Contraseña de tu monedero" - -#~ msgid "at" -#~ msgstr "en" - -#~ msgid "available." -#~ msgstr "disponible." - -#~ msgid "creating your profile" -#~ msgstr "creando tu perfil" - -#~ msgid "in TESTNET" -#~ msgstr "en TESTNET" - -#~ msgid "pending transaction proposals" -#~ msgstr "propuestas de transacciones pendientes" - -#~ msgid "seconds" -#~ msgstr "segundos" - -#, fuzzy -#~ msgid "" -#~ "Network Error.
    Attempting to " -#~ "reconnect.." -#~ msgstr "Error de Red. Intentando reconectar..." - -#~ msgid "(*) The limits are imposed by the bitcoin network." -#~ msgstr "(*) Los límites son impuestos por la red de bitcoin." - -#~ msgid "Addresses" -#~ msgstr "Direcciones" - -#~ msgid "Balance locked in pending transaction proposals" -#~ msgstr "Balance bloqueado en las propuestas de transacción pendientes" - -#~ msgid "Connecting..." -#~ msgstr "Conectando..." - -#~ msgid "Creating and storing a backup will allow you to recover wallet funds" -#~ msgstr "" -#~ "Crear y guardar una copia de seguridad le permitirá recuperar el dinero " -#~ "de su monedero" - -#~ msgid "" -#~ "If all funds have been removed from your wallet and you do not wish to " -#~ "have the wallet data stored on your computer anymore, you can delete your " -#~ "wallet." -#~ msgstr "" -#~ "Si todos los fondos fueron removidos de tu monedero y no deseas tener los " -#~ "datos guardados en tu computadora, puedes eliminar tu monedero." - -#~ msgid "Including fee of" -#~ msgstr "Incluye tasa de" - -#~ msgid "Insufficient funds" -#~ msgstr "Fondos insuficientes" - -#~ msgid "Join a Wallet in Creation" -#~ msgstr "Unirse a un monedero" - -#~ msgid "Manual Update" -#~ msgstr "Actualización Manual" - -#~ msgid "No transactions proposals yet." -#~ msgstr "Sin propuestas de transacciones aún." - -#~ msgid "One person has" -#~ msgstr "Una persona" - -#~ msgid "One signature missing" -#~ msgstr "Falta una firma" - -#~ msgid "Open" -#~ msgstr "Abrir" - -#~ msgid "Open in external application" -#~ msgstr "Abrir en una aplicación externa" - -#~ msgid "Proposal ID" -#~ msgstr "ID de Propuesta" - -#~ msgid "Ready" -#~ msgstr "Listo" - -#~ msgid "Show all" -#~ msgstr "Ver todo" - -#~ msgid "Show less" -#~ msgstr "Ver menos" - -#~ msgid "Skip transaction proposals from Backup" -#~ msgstr "Ignorar propuestas de transacciones desde la Copia de Seguridad" - -#~ msgid "Total" -#~ msgstr "Total" - -#~ msgid "Use all funds" -#~ msgstr "Todos los fondos" - -#~ msgid "Valid" -#~ msgstr "Válido" - -#~ msgid "Waiting Copayers for {{$root.wallet.getName()}}" -#~ msgstr "Esperando compañeros a {{$root.wallet.getName()}}" - -#~ msgid "Waiting for other copayers to make a Backup" -#~ msgstr "Esperando que los otros compañeros hagan su copia de seguridad" - -#~ msgid "Your name (optional)" -#~ msgstr "Tu nombre (opcional)" - -#~ msgid "first seen at" -#~ msgstr "Visto el" - -#~ msgid "mined" -#~ msgstr "minado el" - -#~ msgid "not valid" -#~ msgstr "no válido" - -#~ msgid "people have" -#~ msgstr "personas" - -#~ msgid "required" -#~ msgstr "requerido" - -#~ msgid "yet to backup the wallet." -#~ msgstr "deben hacer su copia de seguridad" - -#~ msgid "yet to join." -#~ msgstr "deben unirse" - -#~ msgid "{{tx.missingSignatures}} signatures missing" -#~ msgstr "Faltan {{tx.missingSignatures}} firmas" - -#, fuzzy -#~ msgid "No transactions yet." -#~ msgstr "Aún no hay transacciones." - -#~ msgid "Authenticating and looking for peers..." -#~ msgstr "Autenticando y buscando compañeros..." - -#~ msgid "Private Key (Hex)" -#~ msgstr "Clave Privada (Hex)" - -#, fuzzy -#~ msgid "Wrong password que parece" -#~ msgstr "Contraseña incorrecta" - -#~ msgid "Add Address" -#~ msgstr "Agregar Dirección" - -#~ msgid "Add Address Book Entry" -#~ msgstr "Nueva entrada" - -#, fuzzy -#~ msgid "Your Password" -#~ msgstr "Tu contraseña" - -#~ msgid "Download seed backup" -#~ msgstr "Descargar copia de seguridad" - -#~ msgid "" -#~ "Network has been fixed to {{networkName}} in this setup. " -#~ "See copay.io for options to use Copay on " -#~ "both livenet and testnet." -#~ msgstr "" -#~ "La red fue fijada a {{networkName}} para esta " -#~ "configuración. Ver copay.io para más " -#~ "opciones de uso de Copay en livenet y testnet." - -#~ msgid "Port" -#~ msgstr "Puerto" - -#~ msgid "Use SSL" -#~ msgstr "Usar SSL" - -#~ msgid "Your Wallet Password" -#~ msgstr "Contraseña de tu Monedero" - -#~ msgid "" -#~ "{{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet" -#~ msgstr "Monedero {{requiredCopayers}}-de-{{totalCopayers}}" - -#~ msgid "« Back" -#~ msgstr "« Volver" - -#~ msgid "Fees" -#~ msgstr "Tasas" - -#~ msgid "" -#~ "Wallet\n" -#~ " name" -#~ msgstr "" -#~ "Nombre del\n" -#~ " monedero" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index 65aefd086..09911f31b 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -2,15 +2,17 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Project-Id-Version: Copay\n" +"Project-Id-Version: copay\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Language: fr\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: fr\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83 \n" +"Language-Team: French\n" +"Language: fr_FR\n" +"PO-Revision-Date: 2015-07-20 12:17-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -18,7 +20,7 @@ msgstr "(double dépense éventuelle)" #: public/views/modals/txp-details.html msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." -msgstr " Une proposition de transaction peut être supprimée si 1) vous êtes le créateur, et aucun des autres copayers n'a signé, ou 2) 24 heures sont passées depuis la création de la proposition." +msgstr "* Une proposition de transaction peut être supprimée si vous en êtes le créateur et qu'aucun des autres copayers n'a signé, ou si 24 heures sont passées depuis la création de la proposition." #: public/views/backup.html msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." @@ -140,7 +142,7 @@ msgstr "Adresse Bitcoin" #: public/views/preferencesFee.html msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "Les transactions Bitcoin peuvent inclure des frais collectés par les mineurs du réseau. Plus les frais sont élevés, et plus l'incitation à inclure une transaction dans un bloc est importante pour les mineurs. La priorité "Urgente" ne devrait être utilisée que lorsque le réseau présente une congestion." +msgstr "Les transactions Bitcoin peuvent inclure des frais collectés par les mineurs du réseau. Plus les frais sont élevés, et plus l'incitation à inclure une transaction dans un bloc est importante pour les mineurs. La priorité \"Urgente\" ne devrait être utilisée que lorsque le réseau présente une congestion." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -224,7 +226,7 @@ msgstr "Copiez la sauvegarde vers un endroit sûr" msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "Copiez ce texte présenté tel quel vers un endroit sûr (bloc-notes ou e-mail)" -#: public/views/backup.html +#: public/views/backup.html msgid "Copy to clipboard" msgstr "Copier dans le presse-papier" @@ -237,7 +239,7 @@ msgid "Could not broadcast payment. Check you connection and try again" msgstr "Impossible de diffuser le paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connexion and your wallet service configuration." +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." msgstr "Impossible de se connecter au service de portefeuille. Vérifiez votre connexion Internet et la configuration de votre service de portefeuille." #: src/js/controllers/walletHome.js @@ -274,7 +276,7 @@ msgstr "Impossible d'importer. Vérifiez le fichier d'entrée et le mot de passe #: src/js/services/profileService.js msgid "Could not join using the specified extended private key" -msgstr "" +msgstr "Impossible de rejoindre en utilisant la clé privée étendue spécifiée" #: src/js/controllers/join.js msgid "Could not join wallet:" @@ -321,7 +323,7 @@ msgstr "Créée par" msgid "Creating Profile..." msgstr "Création du profile..." -#: public/views/create.html +#: public/views/create.html msgid "Creating Wallet..." msgstr "Création du portefeuille..." @@ -441,6 +443,7 @@ msgstr "Impossible d'importer les portefeuilles" msgid "Family vacation funds" msgstr "Fonds pour les vacances familiales" +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Fee" msgstr "Frais" @@ -490,9 +493,9 @@ msgstr "Retour" msgid "Have a Backup from Copay v0.9?" msgstr "Vous avez une sauvegarde de Copay v0.9 ?" -#: public/views/create.html -#: public/views/join.html #: public/views/backup.html +#: public/views/create.html +#: public/views/join.html msgid "Hide Advanced options" msgstr "Masquer les options avancées" @@ -550,7 +553,7 @@ msgstr "Invalide" msgid "Japanese" msgstr "Japonais" -#: public/views/create.html +#: public/views/create.html #: public/views/join.html msgid "John" msgstr "John" @@ -584,14 +587,17 @@ msgstr "Faire un paiement à" msgid "Master extended private key" msgstr "Clé privée étendue maîtresse" -#: public/views/includes/copayers.html +#: public/views/includes/copayers.html #: public/views/modals/copayers.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Me" msgstr "Moi" -#: public/views/modals/paypro.html +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Note" + #: public/views/modals/tx-details.html msgid "Merchant message" msgstr "Message marchand" @@ -648,8 +654,8 @@ msgstr "Non valide" #: public/views/walletHome.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html -msgid "Note:" -msgstr "Note :" +msgid "Note" +msgstr "Note" #: public/views/modals/tx-status.html msgid "OKAY" @@ -660,7 +666,7 @@ msgstr "Ok" msgid "Participants" msgstr "Participants" -#: public/views/import.html +#: public/views/import.html #: public/views/importLegacy.html msgid "Password" msgstr "Mot de passe" @@ -823,7 +829,7 @@ msgstr "Rejet du paiement" msgid "Release Information" msgstr "Informations de version" -#: public/views/backup.html +#: public/views/backup.html #: public/views/includes/password.html msgid "Repeat password" msgstr "Répétez le mot de passe" @@ -833,7 +839,7 @@ msgstr "Répétez le mot de passe" msgid "Request a specific amount" msgstr "Demander un montant précis" -#: public/views/import.html +#: public/views/import.html #: public/views/join.html msgid "Required" msgstr "Requis" @@ -973,10 +979,6 @@ msgstr "Signature de la transaction" msgid "Spanish" msgstr "Espagnol" -#: public/views/walletHome.html -msgid "Spend proposals" -msgstr "Propositions de dépense" - #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1008,13 +1010,28 @@ msgstr "Le paiement a été créé mais n'a pas pu être signé. Veuillez réess msgid "The payment was removed by creator" msgstr "Le paiement a été supprimé par le créateur" +#: src/js/controllers/walletHome.js +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "Le paiement a été signé, mais ne peut pas être diffusé. Veuillez réessayer depuis l'écran d'accueil." + #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." msgstr "La clé privée pour ce portefeuille est chiffrée. Exporter une sauvegarde conservera le chiffrement de la clé dans l'archive de sauvegarde." #: public/views/disclaimer.html msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." -msgstr "Le logiciel que vous êtes sur le point d'utiliser fonctionne comme un portefeuille numérique gratuit, open source et multi-signatures.\nLe logiciel ne constitue pas un compte où BitPay, ou des tiers, agissent comme des intermédiaires financiers ou dépositaires de vos bitcoins.\nBien que le logiciel ait subi des tests bêta et continue d'être amélioré par les commentaires d'utilisateurs et de développeurs de la communauté open source, nous ne pouvons pas garantir qu'il n'y aura plus de bugs dans le logiciel.\nVous reconnaissez que votre utilisation de ce logiciel est à votre propre discrétion et est en conformité avec toutes les lois applicables.\nVous êtes responsable de la sauvegarde de vos mots de passe, paires de clés privées, codes PIN et autres codes que vous utilisez pour accéder au logiciel.\nSI VOUS PERDEZ L'ACCÈS À VOTRE PORTEFEUILLE COPAY OU À VOS CLÉS PRIVÉES CHIFFRÉES ET QUE VOUS N'AVEZ PAS ENTREPOSÉ SÉPARÉMENT UNE SAUVEGARDE DE VOTRE PORTEFEUILLE ET LES MOTS DE PASSE CORRESPONDANT, VOUS RECONNAISSEZ ET ACCEPTEZ QUE LES BITCOINS QUE VOUS AVEZ ASSOCIÉ À CE PORTEFEUILLE COPAY DEVIENNENT INACCESSIBLES.\nToutes les transactions sont irréversibles.\nLes auteurs de ce logiciel, employés et sociétés affiliés à BitPay, détenteurs de droits d'auteur, et BitPay, Inc. ne peuvent pas récupérer vos clés privées ou mots de passe si vous les perdez et ne peuvent pas garantir la confirmation des transactions étant donné qu'ils n'ont pas de contrôle sur le réseau Bitcoin.\nDans toute la mesure permise par la loi, ce logiciel est fourni “tel quel” et aucune représentation ou garantie ne peut être faite de toute nature, expresse ou implicite, y compris, mais sans s'y limiter, les garanties de qualité marchande, la conformité ou un usage particulier et absent de contrefaçon.\nVous assumez tous les risques associés à l'utilisation du logiciel.\nEn aucun cas les auteurs des logiciels, employés et sociétés affiliés de Bitpay, détenteurs de droits d'auteur, ou BitPay, Inc. ne peuvent être tenus responsables de toute réclamation, dommages ou autre responsabilité, que ce soit dans une action contractuelle, délictuelle ou autre, découlant ou en étant en connexion avec le logiciel.\nNous nous réservons le droit de modifier cette clause de temps à autre." +msgstr "Le logiciel que vous êtes sur le point d'utiliser fonctionne comme un portefeuille numérique gratuit, open source et multi-signatures.\n" +"Le logiciel ne constitue pas un compte où BitPay, ou des tiers, agissent comme des intermédiaires financiers ou dépositaires de vos bitcoins.\n" +"Bien que le logiciel ait subi des tests bêta et continue d'être amélioré par les commentaires d'utilisateurs et de développeurs de la communauté open source, nous ne pouvons pas garantir qu'il n'y aura plus de bugs dans le logiciel.\n" +"Vous reconnaissez que votre utilisation de ce logiciel est à votre propre discrétion et est en conformité avec toutes les lois applicables.\n" +"Vous êtes responsable de la sauvegarde de vos mots de passe, paires de clés privées, codes PIN et autres codes que vous utilisez pour accéder au logiciel.\n" +"SI VOUS PERDEZ L'ACCÈS À VOTRE PORTEFEUILLE COPAY OU À VOS CLÉS PRIVÉES CHIFFRÉES ET QUE VOUS N'AVEZ PAS ENTREPOSÉ SÉPARÉMENT UNE SAUVEGARDE DE VOTRE PORTEFEUILLE ET LES MOTS DE PASSE CORRESPONDANT, VOUS RECONNAISSEZ ET ACCEPTEZ QUE LES BITCOINS QUE VOUS AVEZ ASSOCIÉ À CE PORTEFEUILLE COPAY DEVIENNENT INACCESSIBLES.\n" +"Toutes les transactions sont irréversibles.\n" +"Les auteurs de ce logiciel, employés et sociétés affiliés à BitPay, détenteurs de droits d'auteur, et BitPay, Inc. ne peuvent pas récupérer vos clés privées ou mots de passe si vous les perdez et ne peuvent pas garantir la confirmation des transactions étant donné qu'ils n'ont pas de contrôle sur le réseau Bitcoin.\n" +"Dans toute la mesure permise par la loi, ce logiciel est fourni “tel quel” et aucune représentation ou garantie ne peut être faite de toute nature, expresse ou implicite, y compris, mais sans s'y limiter, les garanties de qualité marchande, la conformité ou un usage particulier et absent de contrefaçon.\n" +"Vous assumez tous les risques associés à l'utilisation du logiciel.\n" +"En aucun cas les auteurs des logiciels, employés et sociétés affiliés de Bitpay, détenteurs de droits d'auteur, ou BitPay, Inc. ne peuvent être tenus responsables de toute réclamation, dommages ou autre responsabilité, que ce soit dans une action contractuelle, délictuelle ou autre, découlant ou en étant en connexion avec le logiciel.\n" +"Nous nous réservons le droit de modifier cette clause de temps à autre." #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js @@ -1060,7 +1077,7 @@ msgstr "Transaction" msgid "Unable to send transaction proposal" msgstr "Impossible d'envoyer la proposition de transaction" -#: public/views/walletHome.html +#: public/views/walletHome.html #: public/views/modals/tx-details.html msgid "Unconfirmed" msgstr "Non confirmée" @@ -1138,7 +1155,7 @@ msgid "Wallet name" msgstr "Nom du portefeuille" #: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connexion and your wallet service configuration." +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." msgstr "Le service de portefeuille s'est déconnecté. Vérifiez votre connexion Internetet la configuration de votre service de portefeuille." #: public/views/preferencesDeleteWallet.html @@ -1157,7 +1174,7 @@ msgstr "Oui" msgid "You do not have a wallet" msgstr "Vous n'avez aucun portefeuille" -#: public/views/backup.html +#: public/views/backup.html #: public/views/import.html msgid "Your backup password" msgstr "Votre mot de passe de sauvegarde" @@ -1216,3 +1233,4 @@ msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin" #: src/js/controllers/importLegacy.js msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" msgstr "{{len}} portefeuilles importés. L'analyse des fonds a démarré. Le solde va se mettre à jour" + diff --git a/i18n/po/it.po b/i18n/po/it.po new file mode 100644 index 000000000..bf5c8d97a --- /dev/null +++ b/i18n/po/it.po @@ -0,0 +1,1225 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: copay\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: it\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83 \n" +"Language-Team: Italian\n" +"Language: it_IT\n" +"PO-Revision-Date: 2015-07-20 12:17-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(possibile doppia spesa)" + +#: public/views/modals/txp-details.html +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr "* Una proposta di pagamento può essere eliminata se 1) Tu sei il creatore e nessun altro copayer ha firmato, oppure 2) Sono passate 24 ore da quando la proposta e' stata creata." + +#: public/views/backup.html +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* Puoi installare in modo sicuro il tuo backup su un altro device e usare il tuo portafoglio da più dispositivi contemporaneamente." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "Un backup senza la sua chiave privata permetterà l'utente di vedere il saldo del portafoglio, le transazioni e creare proposte di spese. Tuttavia, non sarà possibile approvare le proposte (firma)." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "Un portafoglio bitcoin multifirma" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "Circa Copay" + +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Accetta" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "Aggiungi un portafoglio" + +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +msgid "Address" +msgstr "Indirizzo" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "Avanzato" + +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Acconsento" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Alias per {{index.walletName}}" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Hai già un portafoglio?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "Valuta alternativa" + +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +#: public/views/modals/txp-details.html +msgid "Amount" +msgstr "Ammontare" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Amount in" +msgstr "Importo in" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "Applicando le modifiche" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "Sei sicuro di voler eliminare questo portafoglio?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "Saldo disponibile" + +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32 Chiave privata master estesa" + +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "Indietro" + +#: public/views/preferences.html +msgid "Backup" +msgstr "Backup" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Backup creato" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "Esegui backup ora" + +#: public/views/backup.html +msgid "Backup options" +msgstr "Opzioni di backup" + +#: public/views/walletHome.html +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "Prima di ricevere fondi, è altamente raccomandato eseguire il backup delle chiavi del portafoglio." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Criterio delle Commissioni del Bitcoin Network" + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "Il Bitcoin URI NON è valido!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "Indirizzo Bitcoin" + +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "Le transazioni in bitcoin possono includere una tassa raccolta dai minatori sulla rete. Più alto il costo, maggiore sarà l'incentivo di un minatore per includere tale transazione in un blocco. Il livello 'Emergenza' dovrebbe essere usato solo quando c'è una congestione di rete." + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Diffusione del Pagamento" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Diffondendo il Pagamento" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Diffondendo la transazione" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "Browser non supportato" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "Ma non trasmesso. Prova a inviare manualmente" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "Annulla" + +#: public/views/copayers.html +#: public/views/walletHome.html +msgid "Cancel" +msgstr "Annulla" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Certificato da" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "Il cambiamento degli alias dei portafogli influenza solo il nome del portafoglio locale." + +#: src/js/controllers/walletHome.js +msgid "Check you connection and try again" +msgstr "Verifica la connessione e riprova" + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "Seleziona un file di backup dal tuo computer" + +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Seleziona un portafoglio per inviare fondi" + +#: public/views/includes/topbar.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Close" +msgstr "Chiudi" + +#: public/views/preferences.html +msgid "Color" +msgstr "Colore" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Commit hash" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "Conferme" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Copayers" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "Copia il backup in un posto sicuro" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "Copia questo testo cosí com'è in un posto sicuro (blocco note o email)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "Copia negli appunti" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment. Check you connection and try again" +msgstr "Impossibile accettare il pagamento. Controlla la connessione e riprova di nuovo" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check you connection and try again" +msgstr "Impossibile trasmettere il pagamento. Controlla la connessione e riprova" + +#: src/js/controllers/walletHome.js +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." +msgstr "Impossibile connettersi al servizio portafoglio. Verifica la tua connessione Internet e la configurazione del servizio portafoglio." + +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check you connection and try again" +msgstr "Impossibile creare l'indirizzo. Verifica la tua connessione e prova di nuovo" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Non posso creare la proposta di pagamento" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Non posso crearlo utilizzando la chiave privata estesa specificata" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Impossibile decrittografare il file, controlla la tua password" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal. Check you connection and try again" +msgstr "Impossibile eliminare la proposta di pagamento. Verifica la tua connessione e prova di nuovo" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Impossibile recuperare le informazioni di pagamento" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "Impossibile recuperare la cronologie delle transazioni" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "Impossibile importare. Verifica file importato e password" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "Impossibile partecipare utilizzando la chiave privata estesa specificata" + +#: src/js/controllers/join.js +msgid "Could not join wallet:" +msgstr "Impossibile partecipare al portafoglio:" + +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Impossibile riconoscere un Codice QR Bitcoin valido" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment. Check you connection and try again" +msgstr "Impossibile rifiutare il pagamento. Verifica la tua connessione e prova di nuovo" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Impossibile inviare il pagamento" + +#: public/views/walletHome.html +msgid "Could not update Wallet" +msgstr "Impossibile aggiornare il Portafoglio" + +#: public/views/walletHome.html +msgid "Create" +msgstr "Crea" + +#: public/views/add.html +#: public/views/create.html +msgid "Create new wallet" +msgstr "Crea nuovo portafoglio" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Crea portafoglio {{requiredCopayers}}-di-{{totalCopayers}}" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "Crea, partecipa o importa" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "Creato da" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Creazione Profilo..." + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "Creazione Portafoglio..." + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Creazione transazione" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "Data" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Elimina Proposta di Pagamento" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "Elimina Portafoglio" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Eliminalo e creane uno nuovo" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Elimina portafoglio" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Eliminazione portafoglio" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Dettagli" + +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "Deutsch" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Disabilitato" + +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Non includere la chiave privata nel backup" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Scarica in formato CSV" + +#: public/views/backup.html +msgid "Download backup" +msgstr "Scarica il backup" + +#: public/views/includes/password.html +msgid "ENTER" +msgstr "IMMETTERE" + +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Economia" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Notifiche Email" + +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "Emergenza" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "Cripta la chiave privata" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Backup criptato salvato" + +#: src/js/controllers/index.js +msgid "English" +msgstr "Inglese" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "Inserisci la tua password" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "Errore creazione portafoglio" + +#: src/js/services/profileService.js +msgid "Error creating wallet. Check your internet connection" +msgstr "Errore creazione portafoglio. Verifica la tua connessione internet" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "Errore importazione portafoglio:" + +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html +msgid "Expires" +msgstr "Scadenza" + +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Impossibile creare il backup" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Impossibile importare portafogli" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "Fondi vacanza di famiglia" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Tassa" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Recuperando le informazioni del pagamento" + +#: src/js/controllers/index.js +msgid "French" +msgstr "Francese" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Fondi ricevuti" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "INIZIA" + +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Genera un codice QR" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "Genera un nuovo indirizzo" + +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Genera un file .csv..." + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Ottengo l'indirizzo per il portafoglio {{selectedWalletName}}..." + +#: public/views/preferences.html +msgid "Global settings" +msgstr "Impostazioni Globali" + +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Indietro" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Hai un Backup da Copay v0.9?" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +msgid "Hide Advanced options" +msgstr "Nascondi opzioni avanzate" + +#: src/js/controllers/index.js +msgid "History" +msgstr "Storico" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Home" + +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "Affermo di aver letto, compreso e accettato questi termini." + +#: public/views/create.html +#: public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "Se non fornita, una chiave sicura sarà generata" + +#: public/views/importLegacy.html +msgid "Import" +msgstr "Importa" + +#: public/views/import.html +#: public/views/splash.html +msgid "Import backup" +msgstr "Importa backup" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "Importare dal Cloud?" + +#: public/views/import.html +msgid "Import here" +msgstr "Importare qui" + +#: public/views/add.html +msgid "Import wallet" +msgstr "Importa un portafoglio" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "Importando il portafoglio..." + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "Importando..." + +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Invalido" + +#: src/js/controllers/index.js +msgid "Japanese" +msgstr "Giapponese" + +#: public/views/create.html +#: public/views/join.html +msgid "John" +msgstr "John" + +#: public/views/join.html +msgid "Join" +msgstr "Unisciti" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "Unisciti al portafoglio condiviso" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "Unendo al portafoglio..." + +#: public/views/preferences.html +msgid "Language" +msgstr "Lingua" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "Ulteriori informazioni sulla migrazione di portafoglio" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Effettuare un pagamento a" + +#: public/views/create.html +#: public/views/join.html +msgid "Master extended private key" +msgstr "Chiave privata principale estesa" + +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Me" +msgstr "Io" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Nota" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Messaggio commerciale" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "Messaggio" + +#: public/views/walletHome.html +msgid "More" +msgstr "Di più" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Spostato" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "Portafoglio Multi-firma" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "Il mio indirizzo Bitcoin" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "Network" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "Nuova proposta di pagamento" + +#: public/views/modals/confirmation.html +msgid "No" +msgstr "No" + +#: public/views/walletHome.html +msgid "No Private key" +msgstr "Nessuna chiave privata" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "Ancora nessuna transazione" + +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Normale" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Not valid" +msgstr "Non valido" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Note" +msgstr "Nota" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "OKAY" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "Partecipanti" + +#: public/views/import.html +#: public/views/importLegacy.html +msgid "Password" +msgstr "Password" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "La password non può essere recuperata. Assicurati di averla scritta/salvata da qualche parte" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "Password necessaria" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "Le passwords non corrispondono" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Incolla qui l'invito" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Incolla qui il codice di backup" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Paga A" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Pagamento Accettato" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Proposta di Pagamento" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Proposta di Pagamento Creata" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Proposta di Pagamento Rifiutata" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Proposta di Pagamento Rifiutata dai Copayers" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Proposta di Pagamento Firmata dai Copayers" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Proposte di Pagamento" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Proposta di Pagamento non supportata dall'applicazione Chrome" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Pagamento Rifiutato" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Pagamento Inviato" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Pagamento accettato..." + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Dettagli pagamento" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Pagamento rifiutato" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Richiesta di pagamento" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Pagamento inviato!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Pagamento a" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "Elimina definitivamente questo portafoglio. QUESTA AZIONE NON PUO' ESSERE INVERTITA" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Portafoglio Personale" + +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Per favore completa i campi richiesti" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Per favore, selezione il tuo file di backup" + +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "Portoghese" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Preferenze" + +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Priorità" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "Codice QR" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR-Scanner" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Ricevi" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Ricevuti" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Riconnessione al Servizio Portafoglio..." + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Ricrea" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Ricreando Portafoglio..." + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "Rifiuta" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Rifiutando il pagamento" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Informazioni Release" + +#: public/views/backup.html +#: public/views/includes/password.html +msgid "Repeat password" +msgstr "Ripeti password" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Richiedi un importo specifico" + +#: public/views/import.html +#: public/views/join.html +msgid "Required" +msgstr "Richiesto" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "Sto riprovando..." + +#: public/views/includes/password.html +msgid "SET" +msgstr "IMPOSTA" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "SALTA BACKUP" + +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Salva" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Sto salvando le preferenze..." + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Scansione terminata" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Scansione degli indirizzi per fondi" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "La scansione è terminata con un errore" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Scansione fondi Portafoglio..." + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "Guardala nella blockchain" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "Seleziona un file di backup" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Selezionare un portafoglio" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Selezionare il numero necessario di firme" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Selezionare il numero totale di copayers" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Invia" + +#: public/views/walletHome.html +msgid "Send All" +msgstr "Invia tutto" + +#: public/views/backup.html +#: public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Invia via email" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Inviato" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "Server" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Registro sessione" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "Imposta una password per il tuo backup" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "Imposta una password" + +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Impostando le notifiche e-mail potrebbe indebolire la tua privacy se il provider di servizio del portafoglio è compromesso. Le informazioni disponibili ad un utente malintenzionato potrebbero includere l'indirizzo del tuo portafoglio e il suo saldo, ma non di più." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Condividi l'indirizzo" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Condividi l'invito" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Condividi questo invito con i tuoi copayers" + +#: public/views/walletHome.html +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Condividi questo indirizzo del portafoglio per ricevere pagamenti. Per proteggere la tua privacy, ad ogni utilizzo sono generati nuovi indirizzi." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Portafoglio Condiviso" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +msgid "Show Advanced options" +msgstr "Mostra opzioni avanzate" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Sto firmando il pagamento" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Sto firmando la transazione" + +#: src/js/controllers/index.js +msgid "Spanish" +msgstr "Spagnolo" + +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Completato" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Tocca per riprovare" + +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Termini di Utilizzo" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: src/js/controllers/walletHome.js +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" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "Il pagamento è stato creato ma è stato impossibile firmarlo. Per favore prova di nuovo dalla schermata iniziale." + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "Il pagamento è stato rimosso dal creatore" + +#: src/js/controllers/walletHome.js +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "Il pagamento è stato firmato ma non è stato possibile trasmetterlo. Per favore prova di nuovo dalla schermata principale." + +#: public/views/backup.html +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "La chiave privata di questo portafoglio è criptata. L'esportazione del backup manterrà la chiave privata criptata nell'archivio backup." + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "Il software che stai per utilizzare è un portafoglio digitale gratis, open source, e multi-firma. Il software non costituisce un account in cui BitPay o altre terze parti servono come intermediari finanziari o custodi dei tuoi bitcoins. Anche se il software beta è stato testato e continua ad essere migliorato dai feedback dalla comunità open source e dai programmatori, non possiamo garantire la completa assenza di errori nel software. Sei consapevole che l'utilizzo di questo software avviene a tua discrezione e in accordo con tutte le leggi applicabili. Sei responsabile della gestione della tua password, chiavi private, PIN e tutti gli altri codici che utilizzi per accedere a questo portafoglio. SE PERDI L'ACCESSO AL TUO PORTAFOGLIO O ALLE TUE CHIAVI PRIVATE CRIPTATE, E NON POSSIEDI UN BACKUP DEL PORTAFOGLIO O DELLE PASSWORD CORRISPONDENTI, SEI CONSAPEVOLE DEL FATTO CHE OGNI BITCOIN ASSOCIATO AL TUO PORTAFOGLIO COPAY SARA' INACCESSIBILE. Tutte le richieste di transazione sono irreversibili. Gli autori del software, dipendenti e affiliati di BitPay, possessori del copyright, e BitPay, Inc., non possono recuperare le tue chiavi private o le tue passwords se le dimentichi o le perdi, e non possono garantire la conferma delle transazioni poichè non sono in controllo del Network Bitcoin. Nella misura massima consentita dalla legge, il software è reso disponibile \"così com'è\" e nessuna rappresentazione o richiesta di garanzia può essere inoltrata, espressa o implicita, comprese ma non limitato alle garanzie di commerciabilità, idoneità o a particolare scopo e non-infrazione. Ti assumi tutti i rischi relativi all'utilizzo del software. In nessuno caso gli autori del software, dipendenti o affiliati BitPay, possessori del Copyright, o BitPay, inc, sono responsabili di qualsiasi rivendicazioni, danni o responsabili di terzi, sia in un'azione di contratto, torto, o derivanti da, o i connessione con questo software. Ci riserviamo il diritto di modificare questi termini di volta in volta." + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "Il portafoglio {{walletName}} è stato eliminato" + +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "Non ci sono portafogli per effettuare questo pagamento" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "C'è un errore nel form" + +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "Questa transazione è diventata invalida; forse a causa di un tentativo di doppia spesa." + +#: public/views/walletHome.html +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." + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "Tempo" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "To" +msgstr "A" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Totale Importo Bloccato" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Transazione" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Impossibile inviare la proposta di transazione" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Non confermato" + +#: public/views/preferences.html +msgid "Unit" +msgstr "Unità" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Transazioni non inviate" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Non attendibile" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Aggiornamento portafoglio..." + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Versione" + +#: public/views/backup.html +msgid "View backup" +msgstr "Visualizza il backup" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "AVVISO: Backup necessario" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "AVVISO: Portafoglio non registrato" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "BENVENUTO A COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "In attesa di copayers" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "In attesa..." + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Alias Portafoglio" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "Portafoglio già importato:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "Invito Portafoglio" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "Invito Portafoglio non valido!" + +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "Il portafoglio esiste già" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Portafoglio incompleto e danneggiato" + +#: public/views/create.html +msgid "Wallet name" +msgstr "Nome Portafoglio" + +#: src/js/controllers/walletHome.js +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +msgstr "Servizio portafoglio scaduto. Verifica la tua connessione internet e la configurazione del tuo servizio portafoglio." + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "Attenzione!" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "Password sbagliata" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Sì" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "Non hai un portafoglio" + +#: public/views/backup.html +#: public/views/import.html +msgid "Your backup password" +msgstr "La tua password di backup" + +#: public/views/create.html +#: public/views/join.html +msgid "Your nickname" +msgstr "Il tuo nickname" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "La tua password" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "La tua password del profilo" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Il tuo portafoglio è stato importato correttamente" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "indirizzo email per le notifiche del portafoglio" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "bloccati da pagamenti in sospeso" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/includes/sidebar.html +msgid "of" +msgstr "di" + +#: public/views/walletHome.html +msgid "optional" +msgstr "opzionale" + +#: public/views/preferences.html +msgid "settings" +msgstr "impostazioni" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "troppo lungo!" + +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" +msgstr "{{fee.value}} bits per kB" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} verranno scalati come commissione del Network Bitcoin" + +#: src/js/controllers/importLegacy.js +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} portafogli importati. Scansione fondi in corso. Aspetta per vedere il bilancio aggiornato" + diff --git a/i18n/po/ja.po b/i18n/po/ja.po index bc08d5b14..ca6c899e0 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -1,47 +1,34 @@ msgid "" msgstr "" -"Project-Id-Version: Copay\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: \n" -"Language-Team: dabura667\n" -"Language: ja\n" -"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: copay\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.6.4\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: ja\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83 \n" +"Language-Team: Japanese\n" +"Language: ja_JP\n" +"PO-Revision-Date: 2015-07-20 12:17-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" msgstr "(二重払い可能性あり)" #: public/views/modals/txp-details.html -msgid "" -"* A payment proposal can be deleted if 1) you are the creator, and no other " -"copayer has signed, or 2) 24 hours have passed since the proposal was " -"created." -msgstr "" -"* 送金の提案の取下げは①他のウォレット参加者に署名されていなかった場合、提案者" -"に提案を取り下げることができます。②提案の起案から24時間が経っても解決しなかっ" -"た場合、全員に取り下げることができます。" +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr "* 送金の提案の取下げは①他のウォレット参加者に署名されていなかった場合、提案者に提案を取り下げることができます。②提案の起案から24時間が経っても解決しなかった場合、全員に取り下げることができます。" #: public/views/backup.html -msgid "" -"* You can safely install your backup on another device and use your wallet " -"from multiple devices at the same time." -msgstr "" -"* 安全にバックアップを別のデバイスにインポートして、同じウォレットを複数の端" -"末でご利用いただけます。" +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* 安全にバックアップを別のデバイスにインポートして、同じウォレットを複数の端末でご利用いただけます。" #: public/views/backup.html -msgid "" -"A backup without its private key will allow the user to see the wallet " -"balance, transactions, and create spend proposals. However, it will not be " -"able to approve (sign) proposals." -msgstr "" -"秘密鍵なしのバックアップでは、残高の確認、取引履歴の確認、送金の提案ができま" -"す。しかし、送金の提案を承諾 (署名) できません。" +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "秘密鍵なしのバックアップでは、残高の確認、取引履歴の確認、送金の提案ができます。しかし、送金の提案を承諾 (署名) できません。" #: public/views/splash.html msgid "A multisignature bitcoin wallet" @@ -59,7 +46,8 @@ msgstr "承諾" msgid "Add wallet" msgstr "ウォレットを追加" -#: public/views/paymentUri.html public/views/modals/customized-amount.html +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html #: public/views/modals/paypro.html msgid "Address" msgstr "アドレス" @@ -84,13 +72,15 @@ msgstr "すでにウォレットをお持ちですか？" msgid "Alternative Currency" msgstr "表示通貨" -#: public/views/paymentUri.html public/views/walletHome.html +#: public/views/paymentUri.html +#: public/views/walletHome.html #: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "金額" -#: public/views/walletHome.html public/views/modals/customized-amount.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Amount in" msgstr "換算済金額" @@ -98,21 +88,23 @@ msgstr "換算済金額" msgid "Applying changes" msgstr "変更を反映" -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "Are you sure you want to delete this wallet?" -msgstr "" -"本当にこのウォレットを削除しても\n" +msgstr "本当にこのウォレットを削除しても\n" "宜しいですか？" #: public/views/walletHome.html msgid "Available Balance" msgstr "送金可能残高" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "BIP32 master extended private key" msgstr "マスタ拡張秘密鍵" -#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Back" msgstr "戻る" @@ -134,11 +126,8 @@ msgid "Backup options" msgstr "バックアップ設定" #: public/views/walletHome.html -msgid "" -"Before receiving funds, it is highly recommended you backup your wallet keys." -msgstr "" -"ビットコインをもらう前に、このウォレットのバックアップすることを強くおすすめ" -"します。" +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "ビットコインをもらう前に、このウォレットのバックアップすることを強くおすすめします。" #: public/views/preferences.html msgid "Bitcoin Network Fee Policy" @@ -153,16 +142,8 @@ msgid "Bitcoin address" msgstr "ビットコインアドレス" #: public/views/preferencesFee.html -msgid "" -"Bitcoin transactions may include a fee collected by miners on the network. " -"The higher the fee, the greater the incentive a miner has to include that " -"transaction in a block. The ‘Emergency’ level should only be used when there " -"is a network congestion." -msgstr "" -"円滑な送金をしていただくために、ビットコインの送金には少量の手数料を付けるこ" -"とが義務付けられております。この手数料はビットコインのネットワークを運用する" -"人たちに寄付され、より高い手数料であればより優先的にブロックに含まれ、承認さ" -"れます。「緊急」の設定はネットワーク全体の混雑時にのみご利用下さい。" +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "円滑な送金をしていただくために、ビットコインの送金には少量の手数料を付けることが義務付けられております。この手数料はビットコインのネットワークを運用する人たちに寄付され、より高い手数料であればより優先的にブロックに含まれ、承認されます。「緊急」の設定はネットワーク全体の混雑時にのみご利用下さい。" #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -188,7 +169,8 @@ msgstr "しかし未送信です。手動で送信してみて下さい。" msgid "CANCEL" msgstr "キャンセル" -#: public/views/copayers.html public/views/walletHome.html +#: public/views/copayers.html +#: public/views/walletHome.html msgid "Cancel" msgstr "キャンセル" @@ -212,9 +194,12 @@ msgstr "パソコンからバックアップファイルを選択して下さい msgid "Choose a wallet to send funds" msgstr "送金元のウォレットを選択して下さい" -#: public/views/includes/topbar.html public/views/modals/copayers.html -#: public/views/modals/customized-amount.html public/views/modals/paypro.html -#: public/views/modals/scanner.html public/views/modals/wallets.html +#: public/views/includes/topbar.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html msgid "Close" msgstr "閉じる" @@ -240,9 +225,7 @@ msgstr "安全な場所でバックアップを保管して下さい" #: public/views/backup.html msgid "Copy this text as it is to a safe place (notepad or email)" -msgstr "" -"このテキストを安全な場所に貼り付けて保管して下さい (メモ帳やメールの下書きな" -"ど)" +msgstr "このテキストを安全な場所に貼り付けて保管して下さい (メモ帳やメールの下書きなど)" #: public/views/backup.html msgid "Copy to clipboard" @@ -257,12 +240,8 @@ msgid "Could not broadcast payment. Check you connection and try again" msgstr "送金できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js -msgid "" -"Could not connect wallet service. Check your Internet connection and your " -"wallet service configuration." -msgstr "" -"ウォレットサービスと接続できませんでした。インターネットの接続とウォレット" -"サービスの設定を確認して下さい。" +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." +msgstr "ウォレットサービスと接続できませんでした。インターネットの接続とウォレットサービスの設定を確認して下さい。" #: src/js/controllers/walletHome.js msgid "Could not create address. Check you connection and try again" @@ -294,8 +273,7 @@ msgstr "取引履歴を取得できませんでした。" #: src/js/services/profileService.js msgid "Could not import. Check input file and password" -msgstr "" -"インポートできませんでした。入力ファイルとパスワードが正しいかご確認下さい。" +msgstr "インポートできませんでした。入力ファイルとパスワードが正しいかご確認下さい。" #: src/js/services/profileService.js msgid "Could not join using the specified extended private key" @@ -325,7 +303,8 @@ msgstr "ウォレットが更新できませんでした。" msgid "Create" msgstr "作成" -#: public/views/add.html public/views/create.html +#: public/views/add.html +#: public/views/create.html msgid "Create new wallet" msgstr "新規ウォレット作成" @@ -377,8 +356,10 @@ msgstr "ウォレットを削除" msgid "Deleting payment" msgstr "取引削除中…" -#: public/views/modals/customized-amount.html public/views/modals/paypro.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Details" msgstr "詳細" @@ -446,7 +427,8 @@ msgstr "ウォレット作成時にエラー発生、インターネットの接 msgid "Error importing wallet:" msgstr "ウォレットインポート時にエラー：" -#: public/views/modals/paypro.html public/views/modals/txp-details.html +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html msgid "Expires" msgstr "有効期限：" @@ -462,7 +444,8 @@ msgstr "ウォレットのインポート失敗しました" msgid "Family vacation funds" msgstr "家族旅行貯金" -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Fee" msgstr "手数料" @@ -511,7 +494,9 @@ msgstr "前に戻る" msgid "Have a Backup from Copay v0.9?" msgstr "Copay v0.9 のバックアップをお持ちですか？" -#: public/views/backup.html public/views/create.html public/views/join.html +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html msgid "Hide Advanced options" msgstr "詳細設定　非表示" @@ -527,7 +512,8 @@ msgstr "ホーム" msgid "I affirm that I have read, understood, and agree with these terms." msgstr "内容をよく読み、理解し、同意します。" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "If not given, a secure key will be generated" msgstr "空欄の場合、安全な鍵を生成します。" @@ -535,7 +521,8 @@ msgstr "空欄の場合、安全な鍵を生成します。" msgid "Import" msgstr "インポート" -#: public/views/import.html public/views/splash.html +#: public/views/import.html +#: public/views/splash.html msgid "Import backup" msgstr "バックアップをインポート" @@ -567,7 +554,8 @@ msgstr "無効" msgid "Japanese" msgstr "日本語" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "John" msgstr "山田太郎" @@ -595,12 +583,15 @@ msgstr "ウォレット移行について詳しく" msgid "Make a payment to" msgstr "支払いは次の宛先へ" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "Master extended private key" msgstr "マスタ拡張秘密鍵" -#: public/views/includes/copayers.html public/views/modals/copayers.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Me" msgstr "自分" @@ -656,11 +647,13 @@ msgstr "取引がありません" msgid "Normal" msgstr "通常" -#: public/views/walletHome.html public/views/modals/customized-amount.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Not valid" msgstr "無効です" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Note" msgstr "メモ" @@ -669,19 +662,19 @@ msgstr "メモ" msgid "OKAY" msgstr "OK" -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Participants" msgstr "参加者" -#: public/views/import.html public/views/importLegacy.html +#: public/views/import.html +#: public/views/importLegacy.html msgid "Password" msgstr "パスワード" #: public/views/includes/password.html msgid "Password cannot be recovered. Be sure to write it down" -msgstr "" -"Copayではパスワードをリセットしてくれる機能がありませんので、パスワードを忘れ" -"ないよう、控えておいて下さい。" +msgstr "Copayではパスワードをリセットしてくれる機能がありませんので、パスワードを忘れないよう、控えておいて下さい。" #: src/js/services/profileService.js msgid "Password needed" @@ -739,7 +732,8 @@ msgstr "クロームのアプリではペイメントプロトコールがサポ msgid "Payment Rejected" msgstr "送金が却下されました" -#: public/views/modals/tx-status.html src/js/services/notificationsService.js +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js msgid "Payment Sent" msgstr "送金が完了しました" @@ -769,15 +763,15 @@ msgstr "支払い先" #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" -msgstr "" -"永久にこのウォレットを削除します。\n" +msgstr "永久にこのウォレットを削除します。\n" "二度と取り戻せない行為ですのどご注意下さい。" #: public/views/create.html msgid "Personal Wallet" msgstr "個人用ウォレット" -#: src/js/controllers/create.js src/js/controllers/join.js +#: src/js/controllers/create.js +#: src/js/controllers/join.js msgid "Please enter the required fields" msgstr "必須項目をご入力下さい" @@ -837,15 +831,18 @@ msgstr "送金の提案却下中" msgid "Release Information" msgstr "リリース情報" -#: public/views/backup.html public/views/includes/password.html +#: public/views/backup.html +#: public/views/includes/password.html msgid "Repeat password" msgstr "パスワードを再入力" -#: public/views/walletHome.html public/views/modals/customized-amount.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Request a specific amount" msgstr "指定金額を要求" -#: public/views/import.html public/views/join.html +#: public/views/import.html +#: public/views/join.html msgid "Required" msgstr "入力必須" @@ -861,7 +858,8 @@ msgstr "指定" msgid "SKIP BACKUP" msgstr "バックアップをスキップ" -#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html #: public/views/preferencesEmail.html msgid "Save" msgstr "保存" @@ -906,7 +904,8 @@ msgstr "必要な署名の数を選択" msgid "Select total number of copayers" msgstr "参加人数を選択して下さい。" -#: public/views/walletHome.html public/views/includes/transaction.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html #: src/js/controllers/index.js msgid "Send" msgstr "送信" @@ -915,7 +914,8 @@ msgstr "送信" msgid "Send All" msgstr "全額を送金" -#: public/views/backup.html public/views/preferencesLogs.html +#: public/views/backup.html +#: public/views/preferencesLogs.html msgid "Send by email" msgstr "メールで送信" @@ -940,14 +940,8 @@ msgid "Set up a password" msgstr "パスワードを設定" #: public/views/preferencesEmail.html -msgid "" -"Setting up email notifications could weaken your privacy, if the wallet " -"service provider is compromised. Information available to an attacker would " -"include your wallet addresses and its balance, but no more." -msgstr "" -"メールのお知らせを有効にすると、悪意のあるサーバー運用者ならあなたの全てのア" -"ドレスとそれぞれの残高・履歴情報が把握できプライバシーの侵害に繋がる可能性が" -"あります。" +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "メールのお知らせを有効にすると、悪意のあるサーバー運用者ならあなたの全てのアドレスとそれぞれの残高・履歴情報が把握できプライバシーの侵害に繋がる可能性があります。" #: public/views/walletHome.html msgid "Share address" @@ -959,25 +953,21 @@ msgstr "招待コードを共有" #: public/views/copayers.html msgid "Share this invitation with your copayers" -msgstr "" -"ウォレット参加者に\n" +msgstr "ウォレット参加者に\n" "この招待コードを\n" "送って下さい。" #: public/views/walletHome.html -msgid "" -"Share this wallet address to receive payments. To protect your privacy, new " -"addresses are generated automatically once you use them." -msgstr "" -"これを人に共有することでビットコインを送ってもらうことができます。プライバ" -"シー向上の観点から、アドレスが1回でも使用されたら新しいアドレスが自動生成され" -"ます。" +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "これを人に共有することでビットコインを送ってもらうことができます。プライバシー向上の観点から、アドレスが1回でも使用されたら新しいアドレスが自動生成されます。" #: public/views/create.html msgid "Shared Wallet" msgstr "共有ウォレットに参加" -#: public/views/backup.html public/views/create.html public/views/join.html +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html msgid "Show Advanced options" msgstr "詳細設定　表示" @@ -993,7 +983,8 @@ msgstr "取引署名中" msgid "Spanish" msgstr "スペイン語" -#: src/js/controllers/copayers.js src/js/controllers/import.js +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" msgstr "成功" @@ -1002,7 +993,8 @@ msgstr "成功" msgid "Tap to retry" msgstr "タップしてやり直し" -#: public/views/disclaimer.html public/views/preferencesAbout.html +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html msgid "Terms of Use" msgstr "利用規約" @@ -1011,123 +1003,32 @@ msgid "Testnet" msgstr "テスト用ネットワーク" #: src/js/controllers/walletHome.js -msgid "" -"The payment was created but could not be completed. Please try again from " -"home screen" -msgstr "" -"送金の提案は作成されましたが完了できませんでした。ホーム画面からやり直して下" -"さい。" +msgid "The payment was created but could not be completed. Please try again from home screen" +msgstr "送金の提案は作成されましたが完了できませんでした。ホーム画面からやり直して下さい。" #: src/js/controllers/walletHome.js -msgid "" -"The payment was created but could not be signed. Please try again from home " -"screen." -msgstr "" -"送金の提案は作成されましたが署名できませんでした。ホーム画面からやり直して下" -"さい。" +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "送金の提案は作成されましたが署名できませんでした。ホーム画面からやり直して下さい。" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "送金の提案が作成者により削除されました" #: src/js/controllers/walletHome.js -msgid "" -"The payment was signed but could not be broadcasted. Please try again from " -"home screen." -msgstr "" -"送金の提案は署名されましたが送信できませんでした。ホーム画面からやり直して下" -"さい。" +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "送金の提案は署名されましたが送信できませんでした。ホーム画面からやり直して下さい。" #: public/views/backup.html -msgid "" -"The private key for this wallet is encrypted. Exporting a backup will keep " -"the private key encrypted in the backup archive." -msgstr "" -"このウォレットの秘密鍵が暗号化されています。バックアップをエクスポートすると" -"秘密鍵が暗号化された状態でバックアップアーカイブとして守られます。" +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "このウォレットの秘密鍵が暗号化されています。バックアップをエクスポートすると秘密鍵が暗号化された状態でバックアップアーカイブとして守られます。" #: public/views/disclaimer.html -msgid "" -"The software you are about to use functions as a free, open source, and " -"multi-signature digital wallet. The software does not constitute an account " -"where BitPay or other third parties serve as financial intermediaries or " -"custodians of your bitcoin. While the software has undergone beta testing " -"and continues to be improved by feedback from the open-source user and " -"developer community, we cannot guarantee that there will be no bugs in the " -"software. You acknowledge that your use of this software is at your own " -"discretion and in compliance with all applicable laws. You are responsible " -"for safekeeping your passwords, private key pairs, PINs and any other codes " -"you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR " -"YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF " -"YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY " -"BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME " -"INACCESSIBLE. All transaction requests are irreversible. The authors of the " -"software, employees and affiliates of Bitpay, copyright holders, and BitPay, " -"Inc. cannot retrieve your private keys or passwords if you lose or forget " -"them and cannot guarantee transaction confirmation as they do not have " -"control over the Bitcoin network. To the fullest extent permitted by law, " -"this software is provided “as is” and no representations or warranties can " -"be made of any kind, express or implied, including but not limited to the " -"warranties of merchantability, fitness or a particular purpose and " -"noninfringement. You assume any and all risks associated with the use of the " -"software. In no event shall the authors of the software, employees and " -"affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for " -"any claim, damages or other liability, whether in an action of contract, " -"tort, or otherwise, arising from, out of or in connection with the software. " -"We reserve the right to modify this disclaimer from time to time." -msgstr "" -"当ソフトウェアは無料のオープンソースプロジェクトで、マルチシグネチャを用いる" -"デジタルウォレットです。BitPay, Inc. 若しくはその他の第三者がアクセス権限を管" -"理する、若しくはデジタル資産の代理保管を行うサービスではありません。このソフ" -"トは長いテスト期間を経てリリースしましたが、今後バグや不具合が見つからないと" -"いう保障はございません。この規約に同意することで、自己責任で利用するものと" -"し、このソフトを用いてお住まいの地域の法令の違反はしないことを意味します。こ" -"のソフトを正常に利用するために必要なパスワード、秘密鍵、暗証番号などの秘密情" -"報は自己責任で管理するものとします。＊＊＊Copayウォレットとその中にある秘密鍵" -"の情報を紛失してしまい、尚且つバックアップが無い、若しくはそのバックアップを" -"暗号化した際のパスワードが分からないなどの状況に陥ってしまえば、そのウォレッ" -"トに含まれた全てのビットコインが永久送金不可能となってしまうことを認識し、同" -"意するものとします。＊＊＊署名が完了してしまった取引は取り消しが不可能となり" -"ます。このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, " -"Inc.自体もパスワード・秘密鍵・パスワードなどへのアクセスが不可能なため、教え" -"ることがだきません、なお、ビットコインのネットワークへの影響が無いので、取引" -"の取り消しや優先的な承認などはできません。このソフトはそのままの提供となり、" -"このソフトの利用に関わるあらゆる責任とリスクを自己責任で被り、利用するものと" -"し、いかなる損害が発生しても、このソフトの開発者、BitPayの従業員とその関係" -"者、著作権所有者、BitPay, Inc.自体も責任を求めることは無いと誓います。この規" -"約の言葉や表現のニュアンスによる解釈が必要となった場合、規約の元である英語の" -"ものを正とします。和訳は簡単な要約と考えて下さい。下記に英語の規約があります" -"ので、英語が理解できる方は是非熟読して下さい。\n" -"\n" -"The software you are about to use functions as a free, open source, and " -"multi-signature digital wallet. The software does not constitute an account " -"where BitPay or other third parties serve as financial intermediaries or " -"custodians of your bitcoin. While the software has undergone beta testing " -"and continues to be improved by feedback from the open-source user and " -"developer community, we cannot guarantee that there will be no bugs in the " -"software. You acknowledge that your use of this software is at your own " -"discretion and in compliance with all applicable laws. You are responsible " -"for safekeeping your passwords, private key pairs, PINs and any other codes " -"you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR " -"YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF " -"YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY " -"BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME " -"INACCESSIBLE. All transaction requests are irreversible. The authors of the " -"software, employees and affiliates of Bitpay, copyright holders, and BitPay, " -"Inc. cannot retrieve your private keys or passwords if you lose or forget " -"them and cannot guarantee transaction confirmation as they do not have " -"control over the Bitcoin network. To the fullest extent permitted by law, " -"this software is provided “as is” and no representations or warranties can " -"be made of any kind, express or implied, including but not limited to the " -"warranties of merchantability, fitness or a particular purpose and " -"noninfringement. You assume any and all risks associated with the use of the " -"software. In no event shall the authors of the software, employees and " -"affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for " -"any claim, damages or other liability, whether in an action of contract, " -"tort, or otherwise, arising from, out of or in connection with the software. " -"We reserve the right to modify this disclaimer from time to time." +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "当ソフトウェアは無料のオープンソースプロジェクトで、マルチシグネチャを用いるデジタルウォレットです。BitPay, Inc. 若しくはその他の第三者がアクセス権限を管理する、若しくはデジタル資産の代理保管を行うサービスではありません。このソフトは長いテスト期間を経てリリースしましたが、今後バグや不具合が見つからないという保障はございません。この規約に同意することで、自己責任で利用するものとし、このソフトを用いてお住まいの地域の法令の違反はしないことを意味します。このソフトを正常に利用するために必要なパスワード、秘密鍵、暗証番号などの秘密情報は自己責任で管理するものとします。＊＊＊Copayウォレットとその中にある秘密鍵の情報を紛失してしまい、尚且つバックアップが無い、若しくはそのバックアップを暗号化した際のパスワードが分からないなどの状況に陥ってしまえば、そのウォレットに含まれた全てのビットコインが永久送金不可能となってしまうことを認識し、同意するものとします。＊＊＊署名が完了してしまった取引は取り消しが不可能となります。このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, Inc.自体もパスワード・秘密鍵・パスワードなどへのアクセスが不可能なため、教えることがだきません、なお、ビットコインのネットワークへの影響が無いので、取引の取り消しや優先的な承認などはできません。このソフトはそのままの提供となり、このソフトの利用に関わるあらゆる責任とリスクを自己責任で被り、利用するものとし、いかなる損害が発生しても、このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, Inc.自体も責任を求めることは無いと誓います。この規約の言葉や表現のニュアンスによる解釈が必要となった場合、規約の元である英語のものを正とします。和訳は簡単な要約と考えて下さい。下記に英語の規約がありますので、英語が理解できる方は是非熟読して下さい。\n\n" +"The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "ウォレット \"{{walletName}}\" が削除されました" @@ -1140,24 +1041,21 @@ msgid "There is an error in the form" msgstr "フォームにエラーがありました" #: public/views/modals/tx-details.html -msgid "" -"This transaction has become invalid; possibly due to a double spend attempt." +msgid "This transaction has become invalid; possibly due to a double spend attempt." msgstr "この取引が無効になりました。二重払いの可能性があります。" #: public/views/walletHome.html -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) サーバーにて、このウォレットの登録が" -"ありません。再登録を行うこともできます。" +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) サーバーにて、このウォレットの登録がありません。再登録を行うこともできます。" #: public/views/modals/txp-details.html msgid "Time" msgstr "時刻" -#: public/views/walletHome.html public/views/includes/transaction.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "To" msgstr "宛先" @@ -1173,7 +1071,8 @@ msgstr "取引" msgid "Unable to send transaction proposal" msgstr "取引提案を送れませんでした。" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html msgid "Unconfirmed" msgstr "未承認" @@ -1187,7 +1086,7 @@ msgstr "未送信取引" #: public/views/modals/paypro.html msgid "Untrusted" -msgstr "信用していない" +msgstr "信頼されていません。" #: public/views/walletHome.html msgid "Updating Wallet..." @@ -1250,12 +1149,8 @@ msgid "Wallet name" msgstr "ウォレット名" #: src/js/controllers/walletHome.js -msgid "" -"Wallet service timed out. Check your Internet connection and your wallet " -"service configuration." -msgstr "" -"ウォレットサービスがタイムアウトになりました。インターネットの接続とウォレッ" -"トサービスの設定を確認して下さい。" +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +msgstr "ウォレットサービスがタイムアウトになりました。インターネットの接続とウォレットサービスの設定を確認して下さい。" #: public/views/preferencesDeleteWallet.html msgid "Warning!" @@ -1273,11 +1168,13 @@ msgstr "はい" msgid "You do not have a wallet" msgstr "ウォレットがありません" -#: public/views/backup.html public/views/import.html +#: public/views/backup.html +#: public/views/import.html msgid "Your backup password" msgstr "バックアップパスワード" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "Your nickname" msgstr "自分のハンドルネーム" @@ -1301,7 +1198,8 @@ msgstr "メールによるウォレットのお知らせ" msgid "locked by pending payments" msgstr "未対応送金の提案によりロック中" -#: public/views/copayers.html public/views/walletHome.html +#: public/views/copayers.html +#: public/views/walletHome.html #: public/views/includes/sidebar.html msgid "of" msgstr "of" @@ -1327,9 +1225,6 @@ msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} のビットコインネットワーク手数料が差し引かれます。" #: src/js/controllers/importLegacy.js -msgid "" -"{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " -"balance" -msgstr "" -"{{len}} 個のウォレットをインポートしました。残高照会中のため、少々お待ち下さ" -"い。" +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} 個のウォレットをインポートしました。残高照会中のため、少々お待ち下さい。" + diff --git a/i18n/po/pt.po b/i18n/po/pt.po index d3ab2e553..8e43cb8af 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -2,31 +2,33 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Project-Id-Version: Copay\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: Tenda WP \n" -"Language-Team: Paulino Michelazzo \n" -"MIME-Version: 1.0\n" -"X-Generator: Poedit 1.6.10\n" +"Project-Id-Version: copay\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language: pt\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: pt-PT\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83 \n" +"Language-Team: Portuguese\n" +"Language: pt_PT\n" +"PO-Revision-Date: 2015-07-20 12:17-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(possible double spend)" #: public/views/modals/txp-details.html -msgid "" -"* Only payment proposals created by yourself with no peer actions can be " -"removed" -msgstr "" -"* Apenas propostas de pagamento criadas por você com nenhuma ação de mesmo " -"nível podem ser removidas." +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 "* 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." #: public/views/backup.html -msgid "" -"* You can safely install your backup on another device and use your wallet " -"from multiple devices at the same time." -msgstr "" -"* Você pode instalar com segurança seu backup em outro dispositivo e usar " -"sua carteira a partir de vários dispositivos ao mesmo tempo." +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* Você pode instalar com segurança seu backup em outro dispositivo e usar sua carteira a partir de vários dispositivos ao mesmo tempo." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." #: public/views/splash.html msgid "A multisignature bitcoin wallet" @@ -44,7 +46,9 @@ msgstr "Aceitar" msgid "Add wallet" msgstr "Adicionar carteira" -#: public/views/paymentUri.html public/views/modals/paypro.html +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html msgid "Address" msgstr "Endereço" @@ -52,13 +56,13 @@ msgstr "Endereço" msgid "Advanced" msgstr "Avançado" -#: public/views/create.html public/views/join.html -msgid "Advanced options" -msgstr "Opções avançadas" +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Agree" #: public/views/preferencesAlias.html -msgid "Alias for" -msgstr "Apelido para" +msgid "Alias for {{index.walletName}}" +msgstr "Alias for {{index.walletName}}" #: public/views/splash.html msgid "Already have a wallet?" @@ -68,12 +72,15 @@ msgstr "Já tem uma carteira?" msgid "Alternative Currency" msgstr "Moeda Alternativa" -#: public/views/paymentUri.html public/views/walletHome.html +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html #: public/views/modals/txp-details.html msgid "Amount" msgstr "Valor" #: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Amount in" msgstr "Montante em" @@ -81,7 +88,8 @@ msgstr "Montante em" msgid "Applying changes" msgstr "Aplicar alterações" -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "Are you sure you want to delete this wallet?" msgstr "Tem certeza que deseja excluir esta carteira?" @@ -89,7 +97,13 @@ msgstr "Tem certeza que deseja excluir esta carteira?" msgid "Available Balance" msgstr "Saldo Disponível" -#: public/views/includes/topbar.html public/views/modals/tx-details.html +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32 master extended private key" + +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Back" msgstr "Voltar" @@ -111,11 +125,12 @@ msgid "Backup options" msgstr "Opções de backup" #: public/views/walletHome.html -msgid "" -"Before receiving funds, it is highly recommended you backup your wallet keys." -msgstr "" -"Antes de receber fundos, é altamente recomendável que você faça backup de " -"suas chaves de carteira." +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "Antes de receber fundos, é altamente recomendável que você faça backup de suas chaves de carteira." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Bitcoin Network Fee Policy" #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" @@ -125,6 +140,10 @@ msgstr "Bitcoin URI não é válido!" msgid "Bitcoin address" msgstr "Endereço Bitcoin" +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." + #: public/views/modals/txp-details.html msgid "Broadcast Payment" msgstr "Transmitir Pagamento" @@ -149,7 +168,8 @@ msgstr "Mas não transmitido. Tente enviar manualmente" msgid "CANCEL" msgstr "CANCELAR" -#: public/views/copayers.html public/views/walletHome.html +#: public/views/copayers.html +#: public/views/walletHome.html msgid "Cancel" msgstr "Cancelar" @@ -159,8 +179,7 @@ msgstr "Certificado por" #: public/views/preferencesAlias.html msgid "Changing wallet alias only affects the local wallet name." -msgstr "" -"Alterando o apelido da carteira somente afeta o nome da carteira local." +msgstr "Alterando o apelido da carteira somente afeta o nome da carteira local." #: src/js/controllers/walletHome.js msgid "Check you connection and try again" @@ -170,8 +189,16 @@ msgstr "Verifique sua conexão e tente novamente" msgid "Choose a backup file from your computer" msgstr "Escolha um arquivo de backup do seu computador" -#: public/views/includes/topbar.html public/views/modals/copayers.html -#: public/views/modals/paypro.html public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Choose a wallet to send funds" + +#: public/views/includes/topbar.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html msgid "Close" msgstr "Fechar" @@ -197,8 +224,7 @@ msgstr "Copie o backup para um lugar seguro" #: public/views/backup.html msgid "Copy this text as it is to a safe place (notepad or email)" -msgstr "" -"Copie este texto como está para um lugar seguro (bloco de notas ou e-mail)" +msgstr "Copie este texto como está para um lugar seguro (bloco de notas ou e-mail)" #: public/views/backup.html msgid "Copy to clipboard" @@ -206,27 +232,19 @@ msgstr "Copiar para área de transferência" #: src/js/controllers/walletHome.js msgid "Could not accept payment. Check you connection and try again" -msgstr "" -"Não foi possível aceitar pagamentos. Verifique sua conexão e tente novamente" +msgstr "Não foi possível aceitar pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js msgid "Could not broadcast payment. Check you connection and try again" -msgstr "" -"Não foi possível transmitir pagamentos. Verifique sua conexão e tente " -"novamente" +msgstr "Não foi possível transmitir pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js -msgid "" -"Could not connect wallet service. Check your Internet connexion and your " -"wallet service configuration." -msgstr "" -"Não foi possível se conectar com o serviço de carteira. Verifique sua " -"conexão e as configurações de seu serviço de carteiras." +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." +msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." #: src/js/controllers/walletHome.js msgid "Could not create address. Check you connection and try again" -msgstr "" -"Não foi possível criar o endereço. Verifique sua conexão e tente novamente" +msgstr "Não foi possível criar o endereço. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -242,9 +260,7 @@ msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" #: src/js/controllers/walletHome.js msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "" -"Não foi possível apagar a proposta de pagamento. Verifique sua conexão e " -"tente novamente" +msgstr "Não foi possível apagar a proposta de pagamento. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -260,17 +276,19 @@ msgstr "Não foi possível importar. Verifique o arquivo de entrada e senha" #: src/js/services/profileService.js msgid "Could not join using the specified extended private key" -msgstr "" -"Não é possível asssociar-se usando a chave privada estendida especificada" +msgstr "Não é possível asssociar-se usando a chave privada estendida especificada" #: src/js/controllers/join.js msgid "Could not join wallet:" msgstr "Não é possível se associar a carteira:" +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Could not recognize a valid Bitcoin QR Code" + #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" -msgstr "" -"Não é possível rejeitar o pagamentos. Verifique sua conexão e tente novamente" +msgstr "Não é possível rejeitar o pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js msgid "Could not send payment" @@ -280,14 +298,19 @@ msgstr "Não foi possível enviar o pagamento" msgid "Could not update Wallet" msgstr "Não é possível atualizar carteira" -#: public/views/create.html public/views/walletHome.html +#: public/views/walletHome.html msgid "Create" msgstr "Criar" #: public/views/add.html +#: public/views/create.html msgid "Create new wallet" msgstr "Criando nova carteira" +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" + #: public/views/includes/sidebar.html msgid "Create, join or import" msgstr "Criar, participar ou importar" @@ -332,15 +355,29 @@ msgstr "Excluir carteira" msgid "Deleting payment" msgstr "Excluindo pagamento" -#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Details" msgstr "Detalhes" +#: src/js/controllers/index.js +msgid "Deutsch" +msgstr "Deutsch" + #: public/views/preferences.html msgid "Disabled" msgstr "Desabilitado" +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Do not include private key in backup" + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Download CSV file" + #: public/views/backup.html msgid "Download backup" msgstr "Baixar backup" @@ -349,10 +386,18 @@ msgstr "Baixar backup" msgid "ENTER" msgstr "ENTER" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Economy" + #: public/views/preferences.html msgid "Email Notifications" msgstr "Notificações por E-mail" +#: src/js/controllers/preferencesFee.js +msgid "Emergency" +msgstr "Emergency" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Criptografar Chave Privada" @@ -381,10 +426,15 @@ msgstr "Erro criando carteira. Verifique sua conexão com a internet" msgid "Error importing wallet:" msgstr "Erro importando carteira:" -#: public/views/modals/paypro.html public/views/modals/txp-details.html +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html msgid "Expires" msgstr "Expira" +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Failed to create backup" + #: src/js/controllers/importLegacy.js msgid "Failed to import wallets" msgstr "Falha ao importar carteiras" @@ -393,6 +443,11 @@ msgstr "Falha ao importar carteiras" msgid "Family vacation funds" msgstr "Fundos de férias com a família" +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Fee" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -410,21 +465,39 @@ msgstr "Fundos recebidos" msgid "GET STARTED" msgstr "COMEÇAR" +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Generate QR Code" + #: public/views/walletHome.html msgid "Generate new address" msgstr "Gerar novo endereço" +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Generating .csv file..." + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Getting address for wallet {{selectedWalletName}} ..." + #: public/views/preferences.html msgid "Global settings" msgstr "Configurações globais" +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Go back" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Tem um Backup do Copay v 0.9?" -#: public/views/create.html public/views/join.html -msgid "Hide" -msgstr "Ocultar" +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +msgid "Hide Advanced options" +msgstr "Hide Advanced options" #: src/js/controllers/index.js msgid "History" @@ -434,10 +507,11 @@ msgstr "História" msgid "Home" msgstr "Início" -#: public/views/create.html -msgid "If not given, a random key will be generated" -msgstr "Se não informada, uma chave randômica será gerada" +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "I affirm that I have read, understood, and agree with these terms." +#: public/views/create.html #: public/views/join.html msgid "If not given, a secure key will be generated" msgstr "Se não informada, uma chave de segurança será gerada" @@ -446,7 +520,8 @@ msgstr "Se não informada, uma chave de segurança será gerada" msgid "Import" msgstr "Importar" -#: public/views/import.html public/views/splash.html +#: public/views/import.html +#: public/views/splash.html msgid "Import backup" msgstr "Importar backup" @@ -470,11 +545,16 @@ msgstr "Importando carteira…" msgid "Importing..." msgstr "Importando…" +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Invalid" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonês" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "John" msgstr "John" @@ -503,11 +583,14 @@ msgid "Make a payment to" msgstr "Fazer um pagamento para" #: public/views/create.html +#: public/views/join.html msgid "Master extended private key" msgstr "Principal chave privada estendida" -#: public/views/includes/copayers.html public/views/modals/copayers.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Me" msgstr "Eu" @@ -551,15 +634,25 @@ msgstr "Nova Proposta de Pagamento" msgid "No" msgstr "Não" +#: public/views/walletHome.html +msgid "No Private key" +msgstr "No Private key" + #: public/views/walletHome.html msgid "No transactions yet" msgstr "Nenhuma transação ainda" +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Normal" + #: public/views/walletHome.html +#: public/views/modals/customized-amount.html msgid "Not valid" msgstr "Inválido" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Note" msgstr "Nota" @@ -568,11 +661,13 @@ msgstr "Nota" msgid "OKAY" msgstr "OKAY" -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "Participants" msgstr "Participantes" -#: public/views/import.html public/views/importLegacy.html +#: public/views/import.html +#: public/views/importLegacy.html msgid "Password" msgstr "Senha" @@ -636,7 +731,8 @@ msgstr "Protocolo de pagamento não suportado no Chrome App" msgid "Payment Rejected" msgstr "Pagamento Rejeitado" -#: public/views/modals/tx-status.html src/js/services/notificationsService.js +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js msgid "Payment Sent" msgstr "Pagamento Enviado" @@ -665,15 +761,15 @@ msgid "Payment to" msgstr "Pagamento para" #: public/views/preferencesDeleteWallet.html -msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" -msgstr "" -"Excluir permanentemente esta carteira. ESTA AÇÃO NÃO PODE SER REVERTIDA" +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" #: public/views/create.html msgid "Personal Wallet" msgstr "Carteira Pessoal" -#: src/js/controllers/create.js src/js/controllers/join.js +#: src/js/controllers/create.js +#: src/js/controllers/join.js msgid "Please enter the required fields" msgstr "Por favor, preencha os campos obrigatórios" @@ -681,10 +777,26 @@ msgstr "Por favor, preencha os campos obrigatórios" msgid "Please, select your backup file" msgstr "Por favor, selecione seu arquivo de backup" +#: src/js/controllers/index.js +msgid "Portuguese" +msgstr "Portuguese" + #: public/views/walletHome.html msgid "Preferences" msgstr "Preferências" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Priority" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "QR Code" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR-Scanner" + #: src/js/controllers/index.js msgid "Receive" msgstr "Receber" @@ -717,11 +829,18 @@ msgstr "Rejeitando pagamento" msgid "Release Information" msgstr "Liberar Informação" -#: public/views/backup.html public/views/includes/password.html +#: public/views/backup.html +#: public/views/includes/password.html msgid "Repeat password" msgstr "Repetir Senha" -#: public/views/import.html public/views/join.html +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Request a specific amount" + +#: public/views/import.html +#: public/views/join.html msgid "Required" msgstr "Obrigatório" @@ -737,7 +856,8 @@ msgstr "DEFINIR" msgid "SKIP BACKUP" msgstr "PULAR BACKUP" -#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html #: public/views/preferencesEmail.html msgid "Save" msgstr "Salvar" @@ -782,12 +902,18 @@ msgstr "Selecione o número de assinaturas necessárias" msgid "Select total number of copayers" msgstr "Selecione o número total de copayers" -#: public/views/walletHome.html public/views/includes/transaction.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html #: src/js/controllers/index.js msgid "Send" msgstr "Enviar" -#: public/views/backup.html public/views/preferencesLogs.html +#: public/views/walletHome.html +msgid "Send All" +msgstr "Send All" + +#: public/views/backup.html +#: public/views/preferencesLogs.html msgid "Send by email" msgstr "Enviar por E-mail" @@ -812,15 +938,8 @@ msgid "Set up a password" msgstr "Configure uma senha" #: public/views/preferencesEmail.html -msgid "" -"Setting up email notifications could weaken your privacy, if the wallet " -"service provider is compromised. Information available to an attacker would " -"include your wallet addresses and its balance, but no more." -msgstr "" -"Configurar notificações de e-mail pode enfraquecer sua privacidade se o " -"prestador de serviços de carteira está comprometido. As informações " -"disponíveis para um invasor podem incluir seus endereços carteira e seu " -"saldo, nada mais." +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Configurar notificações de e-mail pode enfraquecer sua privacidade se o prestador de serviços de carteira está comprometido. As informações disponíveis para um invasor podem incluir seus endereços carteira e seu saldo, nada mais." #: public/views/walletHome.html msgid "Share address" @@ -835,21 +954,18 @@ msgid "Share this invitation with your copayers" msgstr "Compartilhe este convite com seus copayers" #: public/views/walletHome.html -msgid "" -"Share this wallet address to receive payments. To protect your privacy, new " -"addresses are generated automatically once you use them." -msgstr "" -"Compartilhe este endereço da carteira para receber pagamentos. Para proteger " -"sua privacidade, novos endereços são gerados automaticamente cada vez que " -"você usá-los." +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Compartilhe este endereço da carteira para receber pagamentos. Para proteger sua privacidade, novos endereços são gerados automaticamente cada vez que você usá-los." #: public/views/create.html msgid "Shared Wallet" msgstr "Compartilhar Carteira" -#: public/views/create.html public/views/join.html -msgid "Show" -msgstr "Mostrar" +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +msgid "Show Advanced options" +msgstr "Show Advanced options" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -863,7 +979,8 @@ msgstr "Transação assinada" msgid "Spanish" msgstr "Espanhol" -#: src/js/controllers/copayers.js src/js/controllers/import.js +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" msgstr "Sucesso" @@ -872,64 +989,68 @@ msgstr "Sucesso" msgid "Tap to retry" msgstr "Bata para repetir" -#: src/js/controllers/walletHome.js -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." +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Terms of Use" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" #: src/js/controllers/walletHome.js -msgid "" -"The payment was created but could not be signed. Please try again from home " -"screen." -msgstr "" -"O pagamento foi criado mas não pode ser assinado. Por favor, tente novamente " -"a partir da tela inicial." +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." + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "O pagamento foi criado mas não pode ser assinado. Por favor, tente novamente a partir da tela inicial." #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "O pagamento foi removido pelo criador" #: src/js/controllers/walletHome.js -msgid "" -"The payment was signed but could not be broadcasted. Please try again from " -"home screen." -msgstr "" -"O pagamento foi assinado mas não pode ser transmitido. Por favor, tente " -"novamente a partir da tela inicial." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "O pagamento foi assinado mas não pode ser transmitido. Por favor, tente novamente a partir da tela inicial." #: public/views/backup.html -msgid "" -"The private key for this wallet is encrypted. Exporting a backup will keep " -"the private key encrypted in the backup archive." -msgstr "" -"A chave privada para esta carteira é criptografada. A exportação de um " -"backup manterá a chave privada criptografada no arquivo de backup." +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "A chave privada para esta carteira é criptografada. A exportação de um backup manterá a chave privada criptografada no arquivo de backup." -#: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "A carteira “{{walletName}}” foi removida" +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "There are no wallets to make this payment" + #: src/js/controllers/import.js msgid "There is an error in the form" msgstr "Existe um erro no formulário" +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "This transaction has become invalid; possibly due to a double spend attempt." + #: public/views/walletHome.html -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." +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." #: public/views/modals/txp-details.html msgid "Time" msgstr "Hora" -#: public/views/walletHome.html public/views/includes/transaction.html -#: public/views/modals/tx-details.html public/views/modals/txp-details.html +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html msgid "To" msgstr "Para" @@ -945,7 +1066,8 @@ msgstr "Transação" msgid "Unable to send transaction proposal" msgstr "Impossível enviar a proposta de transação" -#: public/views/walletHome.html public/views/modals/tx-details.html +#: public/views/walletHome.html +#: public/views/modals/tx-details.html msgid "Unconfirmed" msgstr "Não confirmado" @@ -1022,12 +1144,8 @@ msgid "Wallet name" msgstr "Nome da carteira" #: src/js/controllers/walletHome.js -msgid "" -"Wallet service timed out. Check your Internet connexion and your wallet " -"service configuration." -msgstr "" -"Serviço de carteira expirou. Verifique sua conexão à Internet e sua " -"configuração do serviço de carteira." +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +msgstr "Wallet service timed out. Check your Internet connection and your wallet service configuration." #: public/views/preferencesDeleteWallet.html msgid "Warning!" @@ -1045,11 +1163,13 @@ msgstr "Sim" msgid "You do not have a wallet" msgstr "Você não tem uma carteira" -#: public/views/backup.html public/views/import.html +#: public/views/backup.html +#: public/views/import.html msgid "Your backup password" msgstr "Sua senha de backup" -#: public/views/create.html public/views/join.html +#: public/views/create.html +#: public/views/join.html msgid "Your nickname" msgstr "Seu apelido" @@ -1073,8 +1193,9 @@ msgstr "e-mail para notificações de carteira" msgid "locked by pending payments" msgstr "bloqueado por pagamentos pendentes" -#: public/views/copayers.html public/views/create.html -#: public/views/walletHome.html public/views/includes/sidebar.html +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/includes/sidebar.html msgid "of" msgstr "de" @@ -1090,14 +1211,15 @@ msgstr "configurações" msgid "too long!" msgstr "muito tempo!" -#: public/views/create.html -msgid "wallet" -msgstr "carteira" +#: public/views/preferencesFee.html +msgid "{{fee.value}} bits per kB" +msgstr "{{fee.value}} bits per kB" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} will be discounted for bitcoin networking fees" #: src/js/controllers/importLegacy.js -msgid "" -"{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " -"balance" -msgstr "" -"{{len}} carteiras importadas. Recursos de digitalização em andamento. Espere " -"para ver o saldo atualizado" +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} carteiras importadas. Recursos de digitalização em andamento. Espere para ver o saldo atualizado" + From badf79e134324a6df781a73ef75a211986ba7c79 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Tue, 21 Jul 2015 03:39:15 +0900 Subject: [PATCH 039/158] added to packages.json --- i18n/crowdin_update.js | 26 ++++++++++++-------------- package.json | 3 ++- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/i18n/crowdin_update.js b/i18n/crowdin_update.js index 392062325..5251d3e4d 100644 --- a/i18n/crowdin_update.js +++ b/i18n/crowdin_update.js @@ -6,19 +6,16 @@ var fs = require('fs'); var path = require('path'); var https = require('https'); var AdmZip = require('adm-zip'); -var bhttp = require("bhttp"); +var bhttp = require('bhttp'); var crowdin_identifier = 'copay' -var crowdin_file_name1 = 'files[template.pot]' var local_file_name1 = path.join(__dirname, 'po/template.pot') var local_file1 = fs.createReadStream(local_file_name1) -var crowdin_file_name2 = 'files[appstore/appstore_en.txt]' var local_file_name2 = path.join(__dirname, 'docs/appstore_en.txt') var local_file2 = fs.createReadStream(local_file_name2) -var crowdin_file_name3 = 'files[appstore/updateinfo_en.txt]' var local_file_name3 = path.join(__dirname, 'docs/updateinfo_en.txt') var local_file3 = fs.createReadStream(local_file_name3) @@ -35,16 +32,16 @@ if (crowdin_api_key != '') { }; bhttp.post('https://api.crowdin.com/api/project/' + crowdin_identifier + '/update-file?key=' + crowdin_api_key, payload, {}, function(err, response) { - console.log("Response from hosting service:", response.body.toString()); + console.log('Response from update file call:', response.body.toString()); + + // This call will tell the server to generate a new zip file for you based on most recent translations. + https.get('https://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key, function(res) { + console.log('Export Got response: ' + res.statusCode); + }).on('error', function(e) { + console.log('Export Got error: ' + e.message); + }); }) - // This call will tell the server to generate a new zip file for you based on most recent translations. - https.get('https://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key, function(res) { - console.log("Export Got response: " + res.statusCode); - }).on('error', function(e) { - console.log("Export Got error: " + e.message); - }); - }; @@ -62,8 +59,9 @@ https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', pos += data[i].length; }; var zip = new AdmZip(buf); - zip.extractAllTo("./", true); - console.log("Done extracting ZIP file."); + zip.extractAllTo('./', true); + console.log('Done extracting ZIP file.'); + }); }); diff --git a/package.json b/package.json index 5509a6c4c..6de5ceba5 100644 --- a/package.json +++ b/package.json @@ -57,9 +57,10 @@ "test": "./node_modules/.bin/grunt test-coveralls" }, "devDependencies": { - "adm-zip": "git://github.com/cthackers/adm-zip.git", + "adm-zip": "^0.4.7", "angular": "^1.3.14", "angular-mocks": "^1.3.14", + "bhttp": "^1.2.1", "grunt-contrib-compress": "^0.13.0", "grunt-contrib-copy": "^0.8.0", "grunt-karma": "^0.10.1", From 211b380cfa474ace7ad01dbff5b6e2f64254750c Mon Sep 17 00:00:00 2001 From: dabura667 Date: Wed, 22 Jul 2015 01:07:24 +0900 Subject: [PATCH 040/158] Separate download and clean up script --- i18n/crowdin_download.js | 79 +++++++++++++++++++++++++++++++++++++ i18n/crowdin_update.js | 25 +----------- i18n/docs/appstore_it.txt | 23 ----------- i18n/docs/updateinfo_de.txt | 7 ---- i18n/docs/updateinfo_it.txt | 7 ---- i18n/docs/updateinfo_pt.txt | 7 ---- i18n/po/de.po | 34 ++++++++-------- i18n/po/el.po | 2 +- i18n/po/es.po | 2 +- i18n/po/fr.po | 2 +- i18n/po/it.po | 2 +- i18n/po/ja.po | 2 +- i18n/po/pt.po | 2 +- 13 files changed, 103 insertions(+), 91 deletions(-) create mode 100644 i18n/crowdin_download.js delete mode 100644 i18n/docs/appstore_it.txt delete mode 100644 i18n/docs/updateinfo_de.txt delete mode 100644 i18n/docs/updateinfo_it.txt delete mode 100644 i18n/docs/updateinfo_pt.txt diff --git a/i18n/crowdin_download.js b/i18n/crowdin_download.js new file mode 100644 index 000000000..baae694ff --- /dev/null +++ b/i18n/crowdin_download.js @@ -0,0 +1,79 @@ +#!/usr/bin/env node + +'use strict'; + +var fs = require('fs'); +var path = require('path'); +var https = require('https'); +var AdmZip = require('adm-zip'); + +var crowdin_identifier = 'copay' + +var local_file_name2 = path.join(__dirname, 'docs/appstore_en.txt') +var local_file_name3 = path.join(__dirname, 'docs/updateinfo_en.txt') + +// Download most recent translations for all languages. +https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { + var data = [], dataLen = 0; + + res.on('data', function(chunk) { + data.push(chunk); + dataLen += chunk.length; + }).on('end', function() { + var buf = new Buffer(dataLen); + for (var i=0, len = data.length, pos = 0; i < len; i++) { + data[i].copy(buf, pos); + pos += data[i].length; + }; + var zip = new AdmZip(buf); + zip.extractAllTo('./', true); + console.log('Done extracting ZIP file.'); + + var files = fs.readdirSync('./docs'); + + for (var i in files) { + if (files[i].slice(0,9) == 'appstore_' && files[i].slice(-4) == '.txt' && files[i] != 'appstore_en.txt') { + var english_file = fs.readFileSync(local_file_name2, 'utf8'); + var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') + if (compare_file == english_file) { + fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); + }; + }; + if (files[i].slice(0,11) == 'updateinfo_' && files[i].slice(-4) == '.txt' && files[i] != 'updateinfo_en.txt') { + var english_file = fs.readFileSync(local_file_name3, 'utf8'); + var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') + if (compare_file == english_file) { + fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); + }; + }; + }; + + console.log('Cleaned out completely untranslated appstore docs.'); + + var files = fs.readdirSync('./po'); + + for (var i in files) { + if (files[i] != 'template.pot') { + var po_file = fs.readFileSync(path.join(__dirname, 'po/' + files[i]), 'utf8'); + var po_array = po_file.split('\n'); + for (var j in po_array) { + if (po_array[j].slice(0,5) == 'msgid') { + var source_text = po_array[j].slice(5); + } else if (po_array[j].slice(0,6) == 'msgstr') { + var translate_text = po_array[j].slice(6); + if (source_text != translate_text) { + break; + }; + }; + if (j == po_array.length - 1) { // All strings are exactly identical to English. Delete po file. + fs.unlinkSync(path.join(__dirname, 'po/' + files[i])); + }; + }; + }; + }; + + console.log('Cleaned out completely untranslated po files.'); + + }); +}); + diff --git a/i18n/crowdin_update.js b/i18n/crowdin_update.js index 5251d3e4d..a83269da2 100644 --- a/i18n/crowdin_update.js +++ b/i18n/crowdin_update.js @@ -5,7 +5,6 @@ var fs = require('fs'); var path = require('path'); var https = require('https'); -var AdmZip = require('adm-zip'); var bhttp = require('bhttp'); var crowdin_identifier = 'copay' @@ -20,7 +19,7 @@ var local_file_name3 = path.join(__dirname, 'docs/updateinfo_en.txt') var local_file3 = fs.createReadStream(local_file_name3) // obtain the crowdin api key -var crowdin_api_key = fs.readFileSync(path.join(__dirname, 'crowdin_api_key.txt')).slice(3) //slicing utf-8 BOM +var crowdin_api_key = fs.readFileSync(path.join(__dirname, 'crowdin_api_key.txt')) //console.log('api key: ' + crowdin_api_key); if (crowdin_api_key != '') { @@ -41,27 +40,5 @@ if (crowdin_api_key != '') { console.log('Export Got error: ' + e.message); }); }) - }; - -// Download most recent translations for all languages. -https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { - var data = [], dataLen = 0; - - res.on('data', function(chunk) { - data.push(chunk); - dataLen += chunk.length; - }).on('end', function() { - var buf = new Buffer(dataLen); - for (var i=0, len = data.length, pos = 0; i < len; i++) { - data[i].copy(buf, pos); - pos += data[i].length; - }; - var zip = new AdmZip(buf); - zip.extractAllTo('./', true); - console.log('Done extracting ZIP file.'); - - }); -}); - diff --git a/i18n/docs/appstore_it.txt b/i18n/docs/appstore_it.txt deleted file mode 100644 index 0a6e38fc8..000000000 --- a/i18n/docs/appstore_it.txt +++ /dev/null @@ -1,23 +0,0 @@ -Secure bitcoin on your own terms with an open source, multisignature wallet from BitPay. -Copay users can hold funds individually or share finances securely with other users with multisignature wallets, which prevent unauthorized payments by requiring multiple approvals. Here are some ways Copay can be used with others: - -To save for vacations or joint purchases with friends -To track family spending and allowances -To manage business, club, or organization funds and expenses - -We built the following features into this version of Copay for a bitcoin wallet that doesn't compromise on security or accessibility: - -Multiple wallet creation and management in-app -Intuitive multisignature security for personal or shared wallets -Easy spending proposal flow for shared wallets and group payments -Hierarchical deterministic (HD) address generation and wallet backups -Device-based security: all private keys are stored locally, not in the cloud -Support for Bitcoin testnet wallets -Synchronous access across all major mobile and desktop platforms -Payment protocol (BIP70-BIP73) support: easily-identifiable payment requests and verifiably secure bitcoin payments -Support for 150+ currency pricing options and unit denomination in BTC or bits -Email notifications for payments and transfers -Customizable wallet naming and background colors -4 supported languages (EN, JP, FR, ES) - -Copay is free and open source software run on non-proprietary servers, so there's no need to rely on any company for continuous support. Anyone can review or contribute to Copay's source code on GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/updateinfo_de.txt b/i18n/docs/updateinfo_de.txt deleted file mode 100644 index 6cc35687a..000000000 --- a/i18n/docs/updateinfo_de.txt +++ /dev/null @@ -1,7 +0,0 @@ -* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) -* Better refresh and sorting rules in transaction history -* Better handling of `invalid` transactions in history -* Better handling of wallets with 1K+ transactions in history -* Exports .csv files with transaction ID -* Better UTXOs selection polices -* Minor bug fixes diff --git a/i18n/docs/updateinfo_it.txt b/i18n/docs/updateinfo_it.txt deleted file mode 100644 index 6cc35687a..000000000 --- a/i18n/docs/updateinfo_it.txt +++ /dev/null @@ -1,7 +0,0 @@ -* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) -* Better refresh and sorting rules in transaction history -* Better handling of `invalid` transactions in history -* Better handling of wallets with 1K+ transactions in history -* Exports .csv files with transaction ID -* Better UTXOs selection polices -* Minor bug fixes diff --git a/i18n/docs/updateinfo_pt.txt b/i18n/docs/updateinfo_pt.txt deleted file mode 100644 index 6cc35687a..000000000 --- a/i18n/docs/updateinfo_pt.txt +++ /dev/null @@ -1,7 +0,0 @@ -* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) -* Better refresh and sorting rules in transaction history -* Better handling of `invalid` transactions in history -* Better handling of wallets with 1K+ transactions in history -* Exports .csv files with transaction ID -* Better UTXOs selection polices -* Minor bug fixes diff --git a/i18n/po/de.po b/i18n/po/de.po index e6c705eb8..0c373a3fb 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -12,11 +12,11 @@ msgstr "" "Last-Translator: cmgustavo83 \n" "Language-Team: German\n" "Language: de_DE\n" -"PO-Revision-Date: 2015-07-20 12:17-0400\n" +"PO-Revision-Date: 2015-07-21 11:53-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" -msgstr "(possible double spend)" +msgstr "(mögliche Doppelausgabe)" #: public/views/modals/txp-details.html 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." @@ -58,7 +58,7 @@ msgstr "Erweitert" #: public/views/disclaimer.html msgid "Agree" -msgstr "Agree" +msgstr "Zustimmen" #: public/views/preferencesAlias.html msgid "Alias for {{index.walletName}}" @@ -284,7 +284,7 @@ msgstr "Beteiligung am Wallet nicht möglich" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" -msgstr "Could not recognize a valid Bitcoin QR Code" +msgstr "Es konnte kein gültiger Bitcoin-QR-Code erkannt werden," #: src/js/controllers/walletHome.js msgid "Could not reject payment. Check you connection and try again" @@ -372,11 +372,11 @@ msgstr "Deaktiviert" #: public/views/backup.html msgid "Do not include private key in backup" -msgstr "Do not include private key in backup" +msgstr "Keine privaten Schlüssel zur Sicherung hinzufügen" #: public/views/walletHome.html msgid "Download CSV file" -msgstr "Download CSV file" +msgstr "CSV-Datei herunterladen" #: public/views/backup.html msgid "Download backup" @@ -408,7 +408,7 @@ msgstr "Verschlüsselte Sicherungsdatei wurde gespeichert" #: src/js/controllers/index.js msgid "English" -msgstr "English" +msgstr "Englisch" #: public/views/includes/password.html msgid "Enter your password" @@ -446,7 +446,7 @@ msgstr "Familienurlaub" #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "Fee" -msgstr "Fee" +msgstr "Gebühr" #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js @@ -475,7 +475,7 @@ msgstr "Neue Adresse erzeugen" #: public/views/walletHome.html msgid "Generating .csv file..." -msgstr "Generating .csv file..." +msgstr "CSV-Datei erzeugen..." #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." @@ -487,7 +487,7 @@ msgstr "Globale Einstellungen" #: public/views/disclaimer.html msgid "Go back" -msgstr "Go back" +msgstr "Zurück" #: public/views/import.html msgid "Have a Backup from Copay v0.9?" @@ -636,7 +636,7 @@ msgstr "Nein" #: public/views/walletHome.html msgid "No Private key" -msgstr "No Private key" +msgstr "Kein privater Schlüssel" #: public/views/walletHome.html msgid "No transactions yet" @@ -659,7 +659,7 @@ msgstr "Notiz" #: public/views/modals/tx-status.html msgid "OKAY" -msgstr "OKAY" +msgstr "Okay" #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html @@ -791,7 +791,7 @@ msgstr "Priority" #: public/views/modals/customized-amount.html msgid "QR Code" -msgstr "QR Code" +msgstr "QR-Code" #: public/views/modals/scanner.html msgid "QR-Scanner" @@ -837,7 +837,7 @@ msgstr "Passwort wiederholen" #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Request a specific amount" -msgstr "Request a specific amount" +msgstr "Einen bestimmten Betrag anfordern" #: public/views/import.html #: public/views/join.html @@ -910,7 +910,7 @@ msgstr "Senden" #: public/views/walletHome.html msgid "Send All" -msgstr "Send All" +msgstr "Alle senden" #: public/views/backup.html #: public/views/preferencesLogs.html @@ -992,7 +992,7 @@ msgstr "Zum Wiederholen antippen" #: public/views/disclaimer.html #: public/views/preferencesAbout.html msgid "Terms of Use" -msgstr "Terms of Use" +msgstr "Nutzungsbedingungen" #: public/views/create.html msgid "Testnet" @@ -1213,7 +1213,7 @@ msgstr "zu lang!" #: public/views/preferencesFee.html msgid "{{fee.value}} bits per kB" -msgstr "{{fee.value}} bits per kB" +msgstr "{{fee.value}} Bits pro kB" #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" diff --git a/i18n/po/el.po b/i18n/po/el.po index fd8dcd1ad..582301b26 100644 --- a/i18n/po/el.po +++ b/i18n/po/el.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83 \n" "Language-Team: Greek\n" "Language: el_GR\n" -"PO-Revision-Date: 2015-07-20 12:17-0400\n" +"PO-Revision-Date: 2015-07-21 11:53-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/es.po b/i18n/po/es.po index ecc400bf4..1f5cae689 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83 \n" "Language-Team: Spanish\n" "Language: es_ES\n" -"PO-Revision-Date: 2015-07-20 12:17-0400\n" +"PO-Revision-Date: 2015-07-21 11:53-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index 09911f31b..22ae41e04 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83 \n" "Language-Team: French\n" "Language: fr_FR\n" -"PO-Revision-Date: 2015-07-20 12:17-0400\n" +"PO-Revision-Date: 2015-07-21 11:53-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/it.po b/i18n/po/it.po index bf5c8d97a..4641a20a5 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83 \n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2015-07-20 12:17-0400\n" +"PO-Revision-Date: 2015-07-21 11:53-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/ja.po b/i18n/po/ja.po index ca6c899e0..0e4384d90 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83 \n" "Language-Team: Japanese\n" "Language: ja_JP\n" -"PO-Revision-Date: 2015-07-20 12:17-0400\n" +"PO-Revision-Date: 2015-07-21 11:53-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/pt.po b/i18n/po/pt.po index 8e43cb8af..9f4962479 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83 \n" "Language-Team: Portuguese\n" "Language: pt_PT\n" -"PO-Revision-Date: 2015-07-20 12:17-0400\n" +"PO-Revision-Date: 2015-07-21 11:53-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" From b944299a33c8e48a43d9d23bba44cfd9afe33f02 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Wed, 22 Jul 2015 01:14:48 +0900 Subject: [PATCH 041/158] Add to readme how to download latest translations. --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ffff90df..1076f742b 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,16 @@ Copay depends on [Bitcore Wallet Service](https://github.com/bitpay/bitcore-wall ## Translations Copay uses standard gettext PO files for translations and [Crowdin](https://crowdin.com/project/copay) as front-end for translators. -To join our team of translators, please create an account at [Crowdin](https://crowdin.com) and sends the request to the language that you want to translate. +To join our team of translators, please create an account at [Crowdin](https://crowdin.com) and translate into your native language to help spread Multisig. + +To download and build using the latest translations from crowdin, please use the following commands. + +```sh +cd i18n +node crowdin_download.js +``` + +This will download all partially/completely translated languages and clean out any un-translated ones. **Translation Credits:** - Japanese: @dabura667 From f7e8619391a9b55a40c5af91b0f0951545540d66 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 23 Jul 2015 09:33:28 +0900 Subject: [PATCH 042/158] Parse language to remove region info --- i18n/crowdin_download.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/i18n/crowdin_download.js b/i18n/crowdin_download.js index baae694ff..b27a6d37a 100644 --- a/i18n/crowdin_download.js +++ b/i18n/crowdin_download.js @@ -55,6 +55,18 @@ https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', for (var i in files) { if (files[i] != 'template.pot') { var po_file = fs.readFileSync(path.join(__dirname, 'po/' + files[i]), 'utf8'); + var lang_pos = po_file.search('"Language: ') + 11; + var po_start = po_file.slice(0,lang_pos); + var po_locale = po_file.slice(lang_pos,lang_pos + 5); + var po_end = po_file.slice(lang_pos + 5); + + if (po_locale.search('_') > 0) { + fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_start + po_locale.slice(0,2) + po_end); + po_start = ''; + po_locale = ''; + po_end = ''; + }; + var po_array = po_file.split('\n'); for (var j in po_array) { if (po_array[j].slice(0,5) == 'msgid') { @@ -76,4 +88,3 @@ https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', }); }); - From b67354063857eea844a129cb87a33998866339e6 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Thu, 23 Jul 2015 11:48:28 +0300 Subject: [PATCH 043/158] Create qrScanner directive --- public/views/includes/topbar.html | 3 +- src/js/controllers/topbar.js | 128 -------------------------- src/js/directives/qrScanner.js | 145 ++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 130 deletions(-) create mode 100644 src/js/directives/qrScanner.js diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index d655c0008..6fc69dac5 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -15,8 +15,7 @@
    - +
    diff --git a/src/js/controllers/topbar.js b/src/js/controllers/topbar.js index deb1a8262..1a15a91c0 100644 --- a/src/js/controllers/topbar.js +++ b/src/js/controllers/topbar.js @@ -1,134 +1,6 @@ 'use strict'; angular.module('copayApp.controllers').controller('topbarController', function($rootScope, $scope, $timeout, $modal, isCordova, isMobile, go) { - var cordovaOpenScanner = function() { - window.ignoreMobilePause = true; - window.plugins.spinnerDialog.show(null, 'Preparing camera...', true); - $timeout(function() { - cordova.plugins.barcodeScanner.scan( - function onSuccess(result) { - $timeout(function() { - window.plugins.spinnerDialog.hide(); - window.ignoreMobilePause = false; - }, 100); - if (result.cancelled) return; - - $timeout(function() { - var data = result.text; - $rootScope.$emit('dataScanned', data); - }, 1000); - }, - function onError(error) { - $timeout(function() { - window.ignoreMobilePause = false; - window.plugins.spinnerDialog.hide(); - }, 100); - alert('Scanning error'); - } - ); - go.send(); - }, 100); - }; - - var modalOpenScanner = function() { - var _scope = $scope; - var ModalInstanceCtrl = function($scope, $rootScope, $modalInstance) { - // QR code Scanner - var video; - var canvas; - var $video; - var context; - var localMediaStream; - - var _scan = function(evt) { - if (localMediaStream) { - context.drawImage(video, 0, 0, 300, 225); - try { - qrcode.decode(); - } catch (e) { - //qrcodeError(e); - } - } - $timeout(_scan, 500); - }; - - var _scanStop = function() { - if (localMediaStream && localMediaStream.stop) localMediaStream.stop(); - localMediaStream = null; - video.src = ''; - }; - - qrcode.callback = function(data) { - _scanStop(); - $modalInstance.close(data); - }; - - var _successCallback = function(stream) { - video.src = (window.URL && window.URL.createObjectURL(stream)) || stream; - localMediaStream = stream; - video.play(); - $timeout(_scan, 1000); - }; - - var _videoError = function(err) { - $scope.cancel(); - }; - - var setScanner = function() { - navigator.getUserMedia = navigator.getUserMedia || - navigator.webkitGetUserMedia || navigator.mozGetUserMedia || - navigator.msGetUserMedia; - window.URL = window.URL || window.webkitURL || - window.mozURL || window.msURL; - }; - - $scope.init = function() { - setScanner(); - $timeout(function() { - go.send(); - canvas = document.getElementById('qr-canvas'); - context = canvas.getContext('2d'); - - - video = document.getElementById('qrcode-scanner-video'); - $video = angular.element(video); - canvas.width = 300; - canvas.height = 225; - context.clearRect(0, 0, 300, 225); - - navigator.getUserMedia({ - video: true - }, _successCallback, _videoError); - }, 500); - }; - - $scope.cancel = function() { - _scanStop(); - $modalInstance.dismiss('cancel'); - }; - }; - - var modalInstance = $modal.open({ - templateUrl: 'views/modals/scanner.html', - windowClass: 'full', - controller: ModalInstanceCtrl, - backdrop : 'static', - keyboard: false - }); - modalInstance.result.then(function(data) { - $rootScope.$emit('dataScanned', data); - }); - - }; - - this.openScanner = function() { - if (isCordova) { - cordovaOpenScanner(); - } - else { - modalOpenScanner(); - } - }; this.goHome = function() { go.walletHome(); diff --git a/src/js/directives/qrScanner.js b/src/js/directives/qrScanner.js new file mode 100644 index 000000000..52feeef15 --- /dev/null +++ b/src/js/directives/qrScanner.js @@ -0,0 +1,145 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('qrScanner', ['$rootScope', '$timeout', '$modal', 'isCordova', 'isMobile', 'go', + function($rootScope, $timeout, $modal, isCordova, isMobile, go) { + + var controller = function($scope) { + + $scope.cordovaOpenScanner = function() { + window.ignoreMobilePause = true; + window.plugins.spinnerDialog.show(null, 'Preparing camera...', true); + $timeout(function() { + cordova.plugins.barcodeScanner.scan( + function onSuccess(result) { + $timeout(function() { + window.plugins.spinnerDialog.hide(); + window.ignoreMobilePause = false; + }, 100); + if (result.cancelled) return; + + $timeout(function() { + var data = result.text; + $rootScope.$emit('dataScanned', data); + }, 1000); + }, + function onError(error) { + $timeout(function() { + window.ignoreMobilePause = false; + window.plugins.spinnerDialog.hide(); + }, 100); + alert('Scanning error'); + } + ); + go.send(); + }, 100); + }; + + $scope.modalOpenScanner = function() { + var ModalInstanceCtrl = function($scope, $rootScope, $modalInstance) { + // QR code Scanner + var video; + var canvas; + var $video; + var context; + var localMediaStream; + + var _scan = function(evt) { + if (localMediaStream) { + context.drawImage(video, 0, 0, 300, 225); + try { + qrcode.decode(); + } catch (e) { + //qrcodeError(e); + } + } + $timeout(_scan, 500); + }; + + var _scanStop = function() { + if (localMediaStream && localMediaStream.stop) localMediaStream.stop(); + localMediaStream = null; + video.src = ''; + }; + + qrcode.callback = function(data) { + _scanStop(); + $modalInstance.close(data); + }; + + var _successCallback = function(stream) { + video.src = (window.URL && window.URL.createObjectURL(stream)) || stream; + localMediaStream = stream; + video.play(); + $timeout(_scan, 1000); + }; + + var _videoError = function(err) { + $scope.cancel(); + }; + + var setScanner = function() { + navigator.getUserMedia = navigator.getUserMedia || + navigator.webkitGetUserMedia || navigator.mozGetUserMedia || + navigator.msGetUserMedia; + window.URL = window.URL || window.webkitURL || + window.mozURL || window.msURL; + }; + + $scope.init = function() { + setScanner(); + $timeout(function() { + go.send(); + canvas = document.getElementById('qr-canvas'); + context = canvas.getContext('2d'); + + + video = document.getElementById('qrcode-scanner-video'); + $video = angular.element(video); + canvas.width = 300; + canvas.height = 225; + context.clearRect(0, 0, 300, 225); + + navigator.getUserMedia({ + video: true + }, _successCallback, _videoError); + }, 500); + }; + + $scope.cancel = function() { + _scanStop(); + $modalInstance.dismiss('cancel'); + }; + }; + + var modalInstance = $modal.open({ + templateUrl: 'views/modals/scanner.html', + windowClass: 'full', + controller: ModalInstanceCtrl, + backdrop : 'static', + keyboard: false + }); + modalInstance.result.then(function(data) { + $rootScope.$emit('dataScanned', data); + }); + + }; + + $scope.openScanner = function() { + if (isCordova) { + $scope.cordovaOpenScanner(); + } + else { + $scope.modalOpenScanner(); + } + }; + }; + + return { + restrict: 'E', + controller: controller, + replace: true, + template: '' + } + } + ]); \ No newline at end of file From 1f4f78bec009b39e3955b1408165a7fc19d6a217 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Thu, 23 Jul 2015 13:21:31 +0300 Subject: [PATCH 044/158] Make directive to accept onScan and beforeScan callbacks instead of broadcasting 'dataScanned' event. This will allow to reuse directive for screens different from 'send' --- public/views/includes/topbar.html | 2 +- src/js/controllers/topbar.js | 10 +++++++++- src/js/directives/qrScanner.js | 17 +++++++++++------ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index 6fc69dac5..b47a18b04 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -15,7 +15,7 @@
    - +
    diff --git a/src/js/controllers/topbar.js b/src/js/controllers/topbar.js index 1a15a91c0..74da473e5 100644 --- a/src/js/controllers/topbar.js +++ b/src/js/controllers/topbar.js @@ -1,6 +1,14 @@ 'use strict'; -angular.module('copayApp.controllers').controller('topbarController', function($rootScope, $scope, $timeout, $modal, isCordova, isMobile, go) { +angular.module('copayApp.controllers').controller('topbarController', function($rootScope, go) { + + this.onQrCodeScanned = function(data) { + $rootScope.$emit('dataScanned', data); + }; + + this.openSendScreen = function() { + go.send(); + }; this.goHome = function() { go.walletHome(); diff --git a/src/js/directives/qrScanner.js b/src/js/directives/qrScanner.js index 52feeef15..ac569eaa1 100644 --- a/src/js/directives/qrScanner.js +++ b/src/js/directives/qrScanner.js @@ -1,8 +1,8 @@ 'use strict'; angular.module('copayApp.directives') - .directive('qrScanner', ['$rootScope', '$timeout', '$modal', 'isCordova', 'isMobile', 'go', - function($rootScope, $timeout, $modal, isCordova, isMobile, go) { + .directive('qrScanner', ['$rootScope', '$timeout', '$modal', 'isCordova', + function($rootScope, $timeout, $modal, isCordova) { var controller = function($scope) { @@ -20,7 +20,7 @@ angular.module('copayApp.directives') $timeout(function() { var data = result.text; - $rootScope.$emit('dataScanned', data); + $scope.onScan({ data: data }); }, 1000); }, function onError(error) { @@ -31,11 +31,12 @@ angular.module('copayApp.directives') alert('Scanning error'); } ); - go.send(); + $scope.beforeScan(); }, 100); }; $scope.modalOpenScanner = function() { + var parentScope = $scope; var ModalInstanceCtrl = function($scope, $rootScope, $modalInstance) { // QR code Scanner var video; @@ -89,7 +90,7 @@ angular.module('copayApp.directives') $scope.init = function() { setScanner(); $timeout(function() { - go.send(); + parentScope.beforeScan(); canvas = document.getElementById('qr-canvas'); context = canvas.getContext('2d'); @@ -120,7 +121,7 @@ angular.module('copayApp.directives') keyboard: false }); modalInstance.result.then(function(data) { - $rootScope.$emit('dataScanned', data); + parentScope.onScan({ data: data }); }); }; @@ -137,6 +138,10 @@ angular.module('copayApp.directives') return { restrict: 'E', + scope: { + onScan: "&", + beforeScan: "&" + }, controller: controller, replace: true, template: '' From 496b88cc0ef45db8cef068f1faea47c0a4b92e6f Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Thu, 23 Jul 2015 13:52:00 +0300 Subject: [PATCH 045/158] Make beforeScan optional --- src/js/directives/qrScanner.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/directives/qrScanner.js b/src/js/directives/qrScanner.js index ac569eaa1..dfb840435 100644 --- a/src/js/directives/qrScanner.js +++ b/src/js/directives/qrScanner.js @@ -31,7 +31,9 @@ angular.module('copayApp.directives') alert('Scanning error'); } ); - $scope.beforeScan(); + if ($scope.beforeScan) { + $scope.beforeScan(); + } }, 100); }; @@ -90,7 +92,9 @@ angular.module('copayApp.directives') $scope.init = function() { setScanner(); $timeout(function() { - parentScope.beforeScan(); + if (parentScope.beforeScan) { + parentScope.beforeScan(); + } canvas = document.getElementById('qr-canvas'); context = canvas.getContext('2d'); From 682c504fecae095542f15d215a05a2d3ce7d87a0 Mon Sep 17 00:00:00 2001 From: Kai Bakker Date: Thu, 23 Jul 2015 14:47:01 +0200 Subject: [PATCH 046/158] Added red as a wallet color option, issue: #3022 Feel free to merge or not. --- src/js/controllers/preferencesColor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index 3728afd8e..77b99f870 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, configService, profileService, go) { var config = configService.getSync(); this.colorOpts = [ + '#DD4B39', '#F38F12', '#FAA77F', '#FADA58', From da0ecfcc715d68558fb36703c0bace880ca56144 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 23 Jul 2015 23:38:14 +0900 Subject: [PATCH 047/158] Efficiency + Privacy --- i18n/crowdin_download.js | 30 ++++++++++++++++++------------ i18n/po/de.po | 6 +++--- i18n/po/el.po | 6 +++--- i18n/po/es.po | 6 +++--- i18n/po/fr.po | 6 +++--- i18n/po/it.po | 6 +++--- i18n/po/ja.po | 6 +++--- i18n/po/pt.po | 6 +++--- 8 files changed, 39 insertions(+), 33 deletions(-) diff --git a/i18n/crowdin_download.js b/i18n/crowdin_download.js index b27a6d37a..c451c1c22 100644 --- a/i18n/crowdin_download.js +++ b/i18n/crowdin_download.js @@ -55,25 +55,31 @@ https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', for (var i in files) { if (files[i] != 'template.pot') { var po_file = fs.readFileSync(path.join(__dirname, 'po/' + files[i]), 'utf8'); - var lang_pos = po_file.search('"Language: ') + 11; - var po_start = po_file.slice(0,lang_pos); - var po_locale = po_file.slice(lang_pos,lang_pos + 5); - var po_end = po_file.slice(lang_pos + 5); - - if (po_locale.search('_') > 0) { - fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_start + po_locale.slice(0,2) + po_end); - po_start = ''; - po_locale = ''; - po_end = ''; - }; - var po_array = po_file.split('\n'); for (var j in po_array) { if (po_array[j].slice(0,5) == 'msgid') { var source_text = po_array[j].slice(5); } else if (po_array[j].slice(0,6) == 'msgstr') { var translate_text = po_array[j].slice(6); + // if a line is not == English, it means there is translation. Keep this file. if (source_text != translate_text) { + // erase email addresses of last translator for privacy + po_file = po_file.replace(/ <[a-zA-Z0-9@.]*>/, '') + fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_file); + + // split the file into 3 parts, before locale, locale, and after locale. + var lang_pos = po_file.search('"Language: ') + 11; + var po_start = po_file.slice(0,lang_pos); + var po_locale = po_file.slice(lang_pos,lang_pos + 5); + var po_end = po_file.slice(lang_pos + 5); + + // check for underscore, if it's there, only take the first 2 letters and reconstruct the po file. + if (po_locale.search('_') > 0) { + fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_start + po_locale.slice(0,2) + po_end); + po_start = ''; + po_locale = ''; + po_end = ''; + }; break; }; }; diff --git a/i18n/po/de.po b/i18n/po/de.po index 0c373a3fb..69e452a65 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -9,10 +9,10 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: template.pot\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: cmgustavo83 \n" +"Last-Translator: cmgustavo83\n" "Language-Team: German\n" -"Language: de_DE\n" -"PO-Revision-Date: 2015-07-21 11:53-0400\n" +"Language: de\n" +"PO-Revision-Date: 2015-07-21 13:31-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/el.po b/i18n/po/el.po index 582301b26..8f488121b 100644 --- a/i18n/po/el.po +++ b/i18n/po/el.po @@ -9,10 +9,10 @@ msgstr "" "X-Crowdin-Language: el\n" "X-Crowdin-File: template.pot\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: cmgustavo83 \n" +"Last-Translator: cmgustavo83\n" "Language-Team: Greek\n" -"Language: el_GR\n" -"PO-Revision-Date: 2015-07-21 11:53-0400\n" +"Language: el\n" +"PO-Revision-Date: 2015-07-21 13:31-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/es.po b/i18n/po/es.po index 1f5cae689..7d096b691 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -9,10 +9,10 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: template.pot\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: cmgustavo83 \n" +"Last-Translator: cmgustavo83\n" "Language-Team: Spanish\n" -"Language: es_ES\n" -"PO-Revision-Date: 2015-07-21 11:53-0400\n" +"Language: es\n" +"PO-Revision-Date: 2015-07-21 13:31-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index 22ae41e04..e23c9f68d 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -9,10 +9,10 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: template.pot\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: cmgustavo83 \n" +"Last-Translator: cmgustavo83\n" "Language-Team: French\n" -"Language: fr_FR\n" -"PO-Revision-Date: 2015-07-21 11:53-0400\n" +"Language: fr\n" +"PO-Revision-Date: 2015-07-21 13:31-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/it.po b/i18n/po/it.po index 4641a20a5..6290387cd 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -9,10 +9,10 @@ msgstr "" "X-Crowdin-Language: it\n" "X-Crowdin-File: template.pot\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: cmgustavo83 \n" +"Last-Translator: cmgustavo83\n" "Language-Team: Italian\n" -"Language: it_IT\n" -"PO-Revision-Date: 2015-07-21 11:53-0400\n" +"Language: it\n" +"PO-Revision-Date: 2015-07-21 13:31-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 0e4384d90..1da24263d 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -9,10 +9,10 @@ msgstr "" "X-Crowdin-Language: ja\n" "X-Crowdin-File: template.pot\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: cmgustavo83 \n" +"Last-Translator: cmgustavo83\n" "Language-Team: Japanese\n" -"Language: ja_JP\n" -"PO-Revision-Date: 2015-07-21 11:53-0400\n" +"Language: ja\n" +"PO-Revision-Date: 2015-07-21 13:31-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/pt.po b/i18n/po/pt.po index 9f4962479..83be167e1 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -9,10 +9,10 @@ msgstr "" "X-Crowdin-Language: pt-PT\n" "X-Crowdin-File: template.pot\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: cmgustavo83 \n" +"Last-Translator: cmgustavo83\n" "Language-Team: Portuguese\n" -"Language: pt_PT\n" -"PO-Revision-Date: 2015-07-21 11:53-0400\n" +"Language: pt\n" +"PO-Revision-Date: 2015-07-21 13:31-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" From f86be1ad2e554386d0d46afa6bafe837b507b317 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 23 Jul 2015 23:52:48 +0900 Subject: [PATCH 048/158] fixed regex --- i18n/crowdin_download.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/crowdin_download.js b/i18n/crowdin_download.js index c451c1c22..018a878a8 100644 --- a/i18n/crowdin_download.js +++ b/i18n/crowdin_download.js @@ -64,7 +64,7 @@ https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', // if a line is not == English, it means there is translation. Keep this file. if (source_text != translate_text) { // erase email addresses of last translator for privacy - po_file = po_file.replace(/ <[a-zA-Z0-9@.]*>/, '') + po_file = po_file.replace(/ <.+@.+\..+>/, '') fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_file); // split the file into 3 parts, before locale, locale, and after locale. From fd2a8dd368e8ab670a2a2b0e56ac572a4f6d30bf Mon Sep 17 00:00:00 2001 From: dabura667 Date: Fri, 24 Jul 2015 00:38:55 +0900 Subject: [PATCH 049/158] update languages --- src/js/controllers/index.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 344feaf7e..bbd1ddf2e 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -41,23 +41,29 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.tab = 'walletHome'; self.availableLanguages = [{ - name: gettext('Deutsch'), - isoCode: 'de', - }, { name: gettext('English'), isoCode: 'en', - }, { - name: gettext('Spanish'), - isoCode: 'es', }, { name: gettext('French'), isoCode: 'fr', }, { - name: gettext('Japanese'), - isoCode: 'ja', + name: gettext('Italian'), + isoCode: 'it', + }, { + name: gettext('German'), + isoCode: 'de', + }, { + name: gettext('Spanish'), + isoCode: 'es', }, { name: gettext('Portuguese'), isoCode: 'pt', + }, { + name: gettext('Greek'), + isoCode: 'el', + }, { + name: gettext('Japanese'), + isoCode: 'ja', }]; self.setOngoingProcess = function(processName, isOn) { From 23b223ea26e8e8ff58a0271e4d3fb8f8b12e827d Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 25 Jul 2015 09:57:16 +0900 Subject: [PATCH 050/158] Translation compiler fix --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 23e7a0c60..5ff7bcb54 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -126,7 +126,7 @@ module.exports = function(grunt) { module: 'copayApp' }, files: { - 'src/js/translations.js': ['po/*.po'] + 'src/js/translations.js': ['i18n/po/*.po'] } }, }, From 149eac3df8e24114be214682195351798b7ebb3e Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 25 Jul 2015 11:10:46 +0900 Subject: [PATCH 051/158] check for files before download --- i18n/crowdin_download.js | 9 +++++++++ i18n/docs/updateinfo_ko.txt | 7 +++++++ i18n/docs/updateinfo_tr.txt | 7 +++++++ i18n/po/de.po | 18 +++++++++++++----- i18n/po/el.po | 18 +++++++++++++----- i18n/po/es.po | 18 +++++++++++++----- i18n/po/fr.po | 18 +++++++++++++----- i18n/po/it.po | 18 +++++++++++++----- i18n/po/ja.po | 18 +++++++++++++----- i18n/po/pt.po | 18 +++++++++++++----- 10 files changed, 114 insertions(+), 35 deletions(-) create mode 100644 i18n/docs/updateinfo_ko.txt create mode 100644 i18n/docs/updateinfo_tr.txt diff --git a/i18n/crowdin_download.js b/i18n/crowdin_download.js index 018a878a8..5470a2a9e 100644 --- a/i18n/crowdin_download.js +++ b/i18n/crowdin_download.js @@ -12,6 +12,15 @@ var crowdin_identifier = 'copay' var local_file_name2 = path.join(__dirname, 'docs/appstore_en.txt') var local_file_name3 = path.join(__dirname, 'docs/updateinfo_en.txt') +try { + fs.statSync(local_file_name2); + fs.statSync(local_file_name3); +} +catch (e) { + console.log('\n### ABORTING ### One of the following files does not exist:\n' + local_file_name2 + '\n' + local_file_name3); + process.exit(1); +} + // Download most recent translations for all languages. https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { var data = [], dataLen = 0; diff --git a/i18n/docs/updateinfo_ko.txt b/i18n/docs/updateinfo_ko.txt new file mode 100644 index 000000000..250e40459 --- /dev/null +++ b/i18n/docs/updateinfo_ko.txt @@ -0,0 +1,7 @@ +서명 기능과 관계 없는 백업 생성이 가능합니다. (https://github.com/bitpay/copay/pull/2998 더 많은 정보) +* 트랜잭션 기록의 더 나은 새로고침 및 정렬 +* 기록에서의 더 나은 '무효' 거래 처리 +* 1천회가 넘는 지갑의 기록 처리 향상 +트랜잭션 ID를 이용한 .csv 파일 내보내기 +* 더 나은 UXTO 선택 정책 +자잘한 버그 수정 diff --git a/i18n/docs/updateinfo_tr.txt b/i18n/docs/updateinfo_tr.txt new file mode 100644 index 000000000..50387207c --- /dev/null +++ b/i18n/docs/updateinfo_tr.txt @@ -0,0 +1,7 @@ +*Artık imza özelliği olmadan yedek almak mümkün (daha fazla bilgi için https://github.com/bitpay/copay/pull/2998) +*İşlem geçmişinde daha iyi yenileme ve sıralama kuralları +*Geçmişteki `geçersiz` işlemleri daha iyi kullanma +*Geçmişte 1K+ fazla işlemlerin olduğu cüzdanlara daha iyi kullanım +*İşlem kimliği ile .csv dosyalarını çıkarma +*Daha iyi UTXO seçim ilkeleri +*Küçük hata düzeltmeleri diff --git a/i18n/po/de.po b/i18n/po/de.po index 69e452a65..f1d6c22d9 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: German\n" "Language: de\n" -"PO-Revision-Date: 2015-07-21 13:31-0400\n" +"PO-Revision-Date: 2015-07-23 11:32-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -362,10 +362,6 @@ msgstr "Zahlung löschen" msgid "Details" msgstr "Details" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "Deutsch" - #: public/views/preferences.html msgid "Disabled" msgstr "Deaktiviert" @@ -477,6 +473,10 @@ msgstr "Neue Adresse erzeugen" msgid "Generating .csv file..." msgstr "CSV-Datei erzeugen..." +#: src/js/controllers/index.js +msgid "German" +msgstr "Deutsch" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Getting address for wallet {{selectedWalletName}} ..." @@ -489,6 +489,10 @@ msgstr "Globale Einstellungen" msgid "Go back" msgstr "Zurück" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "Griechisch" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Ist eine Copay v0.9 Sicherung vorhanden" @@ -549,6 +553,10 @@ msgstr "Importiere..." msgid "Invalid" msgstr "Invalid" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "Italienisch" + #: src/js/controllers/index.js msgid "Japanese" msgstr "日本語" diff --git a/i18n/po/el.po b/i18n/po/el.po index 8f488121b..81fd45f46 100644 --- a/i18n/po/el.po +++ b/i18n/po/el.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Greek\n" "Language: el\n" -"PO-Revision-Date: 2015-07-21 13:31-0400\n" +"PO-Revision-Date: 2015-07-23 11:32-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -362,10 +362,6 @@ msgstr "Διαγραφή πληρωμής" msgid "Details" msgstr "Λεπτομέρειες" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "Γερμανικά" - #: public/views/preferences.html msgid "Disabled" msgstr "Απενεργοποιημένο" @@ -477,6 +473,10 @@ msgstr "Δημιουργία νέας διεύθυνσης" msgid "Generating .csv file..." msgstr "Δημιουργία .csv αρχείου..." +#: src/js/controllers/index.js +msgid "German" +msgstr "Γερμανικά" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Λήψη διεύθυνσης για το πορτοφόλι {{selectedWalletName}} ..." @@ -489,6 +489,10 @@ msgstr "Καθολικές ρυθμίσεις" msgid "Go back" msgstr "Πάμε πίσω" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "Ελληνικά" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Έχετε ένα αντίγραφο ασφαλείας από το Copay έκδοση 0.9?" @@ -549,6 +553,10 @@ msgstr "Εισαγωγή ..." msgid "Invalid" msgstr "Μη έγκυρο" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "Ιταλικά" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Ιαπωνικά" diff --git a/i18n/po/es.po b/i18n/po/es.po index 7d096b691..9b5031801 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Spanish\n" "Language: es\n" -"PO-Revision-Date: 2015-07-21 13:31-0400\n" +"PO-Revision-Date: 2015-07-23 11:32-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -362,10 +362,6 @@ msgstr "Eliminando el Pago" msgid "Details" msgstr "Detalles" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "Alemán" - #: public/views/preferences.html msgid "Disabled" msgstr "Deshabilitado" @@ -477,6 +473,10 @@ msgstr "Generar nueva dirección" msgid "Generating .csv file..." msgstr "Generando archivo .csv..." +#: src/js/controllers/index.js +msgid "German" +msgstr "Alemán" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Obteniendo direcciones para el monedero {{selectedWalletName}} ..." @@ -489,6 +489,10 @@ msgstr "Opciones globales" msgid "Go back" msgstr "Volver" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "Griego" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "¿Tiene una copia de seguridad de Copay v0.9?" @@ -549,6 +553,10 @@ msgstr "Importando..." msgid "Invalid" msgstr "Inválido" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "Italiano" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonés" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index e23c9f68d..befa8c1c1 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: French\n" "Language: fr\n" -"PO-Revision-Date: 2015-07-21 13:31-0400\n" +"PO-Revision-Date: 2015-07-23 11:32-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -362,10 +362,6 @@ msgstr "Suppression du paiement" msgid "Details" msgstr "Détails" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "Allemand" - #: public/views/preferences.html msgid "Disabled" msgstr "Désactivé" @@ -477,6 +473,10 @@ msgstr "Générer une nouvelle adresse" msgid "Generating .csv file..." msgstr "Génération du fichier .csv..." +#: src/js/controllers/index.js +msgid "German" +msgstr "Allemand" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Obtention d'une adresse pour le portefeuille {{selectedWalletName}} ..." @@ -489,6 +489,10 @@ msgstr "Paramètres globaux" msgid "Go back" msgstr "Retour" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "Grec" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Vous avez une sauvegarde de Copay v0.9 ?" @@ -549,6 +553,10 @@ msgstr "Importation..." msgid "Invalid" msgstr "Invalide" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "Italien" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonais" diff --git a/i18n/po/it.po b/i18n/po/it.po index 6290387cd..94f57bbd1 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Italian\n" "Language: it\n" -"PO-Revision-Date: 2015-07-21 13:31-0400\n" +"PO-Revision-Date: 2015-07-23 11:32-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -362,10 +362,6 @@ msgstr "Eliminazione portafoglio" msgid "Details" msgstr "Dettagli" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "Deutsch" - #: public/views/preferences.html msgid "Disabled" msgstr "Disabilitato" @@ -477,6 +473,10 @@ msgstr "Genera un nuovo indirizzo" msgid "Generating .csv file..." msgstr "Genera un file .csv..." +#: src/js/controllers/index.js +msgid "German" +msgstr "Tedesco" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Ottengo l'indirizzo per il portafoglio {{selectedWalletName}}..." @@ -489,6 +489,10 @@ msgstr "Impostazioni Globali" msgid "Go back" msgstr "Indietro" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "Greco" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Hai un Backup da Copay v0.9?" @@ -549,6 +553,10 @@ msgstr "Importando..." msgid "Invalid" msgstr "Invalido" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "Italiano" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Giapponese" diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 1da24263d..31d11ced6 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Japanese\n" "Language: ja\n" -"PO-Revision-Date: 2015-07-21 13:31-0400\n" +"PO-Revision-Date: 2015-07-23 11:32-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -363,10 +363,6 @@ msgstr "取引削除中…" msgid "Details" msgstr "詳細" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "ドイツ語" - #: public/views/preferences.html msgid "Disabled" msgstr "無効" @@ -478,6 +474,10 @@ msgstr "新規アドレスを生成" msgid "Generating .csv file..." msgstr "CSVファイル作成中…" +#: src/js/controllers/index.js +msgid "German" +msgstr "ドイツ語" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "「{{selectedWalletName}}」のアドレスを取得中…" @@ -490,6 +490,10 @@ msgstr "グローバル設定" msgid "Go back" msgstr "前に戻る" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "ギリシャ語" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Copay v0.9 のバックアップをお持ちですか？" @@ -550,6 +554,10 @@ msgstr "インポート中…" msgid "Invalid" msgstr "無効" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "イタリア語" + #: src/js/controllers/index.js msgid "Japanese" msgstr "日本語" diff --git a/i18n/po/pt.po b/i18n/po/pt.po index 83be167e1..ee04d2efc 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Portuguese\n" "Language: pt\n" -"PO-Revision-Date: 2015-07-21 13:31-0400\n" +"PO-Revision-Date: 2015-07-23 11:32-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -362,10 +362,6 @@ msgstr "Excluindo pagamento" msgid "Details" msgstr "Detalhes" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "Deutsch" - #: public/views/preferences.html msgid "Disabled" msgstr "Desabilitado" @@ -477,6 +473,10 @@ msgstr "Gerar novo endereço" msgid "Generating .csv file..." msgstr "Generating .csv file..." +#: src/js/controllers/index.js +msgid "German" +msgstr "Alemão" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "Getting address for wallet {{selectedWalletName}} ..." @@ -489,6 +489,10 @@ msgstr "Configurações globais" msgid "Go back" msgstr "Go back" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "Grego" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "Tem um Backup do Copay v 0.9?" @@ -549,6 +553,10 @@ msgstr "Importando…" msgid "Invalid" msgstr "Invalid" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "Italiano" + #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonês" From 5a621c862da976b4be7c01e90db0eedc946ef2ce Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 25 Jul 2015 12:01:34 +0900 Subject: [PATCH 052/158] update template.pot --- i18n/po/template.pot | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 58cddeb22..62e4b15c1 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -352,10 +352,6 @@ msgstr "" msgid "Details" msgstr "" -#: src/js/controllers/index.js -msgid "Deutsch" -msgstr "" - #: public/views/preferences.html msgid "Disabled" msgstr "" @@ -467,6 +463,10 @@ msgstr "" msgid "Generating .csv file..." msgstr "" +#: src/js/controllers/index.js +msgid "German" +msgstr "" + #: public/views/modals/wallets.html msgid "Getting address for wallet {{selectedWalletName}} ..." msgstr "" @@ -479,6 +479,10 @@ msgstr "" msgid "Go back" msgstr "" +#: src/js/controllers/index.js +msgid "Greek" +msgstr "" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "" @@ -539,6 +543,10 @@ msgstr "" msgid "Invalid" msgstr "" +#: src/js/controllers/index.js +msgid "Italian" +msgstr "" + #: src/js/controllers/index.js msgid "Japanese" msgstr "" From f040967e4c661d5538de64a75be0359296b6c141 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 27 Jul 2015 12:22:51 -0300 Subject: [PATCH 053/158] Updates linux icons for copay --- Gruntfile.js | 4 ++-- package.json | 4 ++-- {webkitbuilds => public/img/icons}/favicon.ico | Bin public/img/icons/icon-256.png | Bin 0 -> 28117 bytes webkitbuilds/.desktop | 7 +++++-- 5 files changed, 9 insertions(+), 6 deletions(-) rename {webkitbuilds => public/img/icons}/favicon.ico (100%) create mode 100644 public/img/icons/icon-256.png diff --git a/Gruntfile.js b/Gruntfile.js index 5ff7bcb54..4f4747dc4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -139,8 +139,8 @@ module.exports = function(grunt) { }, linux: { files: [ - {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', 'favicon.ico'],dest: 'webkitbuilds/copay/linux32/', flatten: true, filter: 'isFile' }, - {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', 'favicon.ico'],dest: 'webkitbuilds/copay/linux64/', flatten: true, filter: 'isFile' }, + {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'],dest: 'webkitbuilds/copay/linux32/', flatten: true, filter: 'isFile' }, + {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'],dest: 'webkitbuilds/copay/linux64/', flatten: true, filter: 'isFile' }, ], } }, diff --git a/package.json b/package.json index 6de5ceba5..70d5546ac 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,8 @@ ], "main": "public/index.html", "window": { + "title": "Copay - A multisignature wallet", + "icon": "./public/img/icons/icon-256.png", "toolbar": false, "show": true, "visible": true, @@ -48,8 +50,6 @@ "grunt-contrib-uglify": "^0.8.0", "grunt-contrib-watch": "^0.5.3", "grunt-exec": "^0.4.6", - "grunt-markdown": "^0.5.0", - "grunt-release": "^0.7.0", "shelljs": "^0.3.0" }, "scripts": { diff --git a/webkitbuilds/favicon.ico b/public/img/icons/favicon.ico similarity index 100% rename from webkitbuilds/favicon.ico rename to public/img/icons/favicon.ico diff --git a/public/img/icons/icon-256.png b/public/img/icons/icon-256.png new file mode 100644 index 0000000000000000000000000000000000000000..f9978eb2864a07683a855d62b615b3c175d70992 GIT binary patch literal 28117 zcmY&=Wmp^C^EOi4p*R#P(&Fw;k>Z6GhvM!~oZwQll;RFWid%7lOL2F1cMD1O&+~gf zynB=XKK5a2`~w;8w>%5WC#Q8=!Rnx?{ay2${W06#2pkOjP@zq+c)b--dmmQn`u`n6 z0anUjyYJEo0Pi6V*G}MZC;#nG7n9wsJA)ijox7_PVlqKPj^Z7#8FyfeN`lkM=P`#yIJd}!5?ce7j4>dUBS__HJyEA{ z;{FjY>OG#2v1zFarZz+JN4)u(ej34nv@jVT>X7{6YM84a4|thfMt%totQtwKxH`@> zb&%YB(7w`RtoJ4TH99kr@$=4r1;ri?8$WClG)y3qX@0_O9P_l0icrzyt5A(qOpM>B z7}bnSNb^peWH;iYw^#wWAjTgP3oD=apZcUW$rX*5s~Gj(_zuO|LyaUT+TZl%KOZnS zm9t+7NOvF^+y-2u0*qF&@PjhA;4(iJ^;fd|`>@w+rk#Yp&ShA&Wy>s`!o*DIh$wM1 zGL;_DGv~<$_YG7e^0rW9N``rDgbb*yuOQe*4O6r*CT-PFfP!&M{6=l)tw7$M^^l}J zR=4SIy*x6yEWJ32SGXT#cIcaKs-$2iya*X)|Caa)49|T$)Gh+PhNVqB(`I#3(hc#` z*|)X{2Po&%{|v0(n0X)OO<)xtO4LitlB|^-fp64+0gND94UKFz?)^xZWGj*qrG#30 zM?$M%kPQp*2>BBmo6)21G?R;m#?F_kQ7vZvW1?AJ8<<9Nw&N^mF`J}WqG4)iSaz_6 z@Y~(r;!D1%h+U-9iK>QzKe|CUg?;f`a#1q3>=&^u19)iUv4RVRU5TLRxK}PYCtz2! zJe*($Us)Ts9cd!$l6JO4Z^!q{(=v(ChWI?{6p8o;A_oX<@@tnG#hD2wIyq5-;o5gL z$Duy#p|j51PM2VE#T=Zchoq~F@)Nxik=JBHilJnLIwE*>eF5)7KbHckT;K5+RdU;L zT?@GqB$bjqd!MYokE6Ov))T!c_kWWp@zgriMZ$uV2=e{YhP!=qe^^1tlFhl|Foedm zxbt2eMhWG7YShJkdf?GVyQ}6zY~N^{TGB>GboFDjkha~<;?)&Q6DaVkAhhYlBEZ7^ zN#OMkWs*x~Rk=(|EvRAhuXL2Z6Mmk&G8!P*?Szg4rPUWTVE#GRwA&EQe4&4 z+NsfD&k7P8`J#k(`l4iVkch1fz_am<<`jhO+w2&>6aQ=w$w+$&$C^)?e^YOACEJG5$im$+u z&y*B%N60qr$j))YFn}6=H57yua31QI$p52+Dx8XmeaXu}R_7(bS0?1EbFS^x=7o!x zCjXP%&AqaptA5RVj?l1Az#SJ5O}g`OaeHBPiK!BC!EhK6Uv`hY@7*q+1orIQWo1M# zeroB{Ybt!%JK;XzH%v!aMEE7*$+GA>3S&W@OcPAAqgnNWE z(1$E;X$tk|_(2u-P~ovZs>s%g{9u`!rC;+F^aHKu?%$k}lSvPP7La{Qk?m#SwWhjM zd|&zqSjd0Qf&)qNEU7~*x;z6nieQt%0^-LwD0fg@ncv7UYa27UrlNJ>sIGaxzad5`|;+wT62c0 zcAnVG3ireWj!8QwS+KK68pi$fy@_J7oU!wUE(Pxn|C3-|?ASl%4|0J7CCU|2iN7AL z_&Bi&Mto$*@<#R!vV(A49h1fFe$|LNAa2<^Ni`yF=5b3=GgCpGcV9xsvAO5T#v7!% z9?i5ah1aFT^@Qj@u)i@=svLOqxVa8zZmCh^4M_Co94`i3|rd2F>tD z86_bfxEQaD2usDLbd1N9l>NnpeK2F6DE&yKf8F;b+dUIen}W#_8!q^u5c5$O_sIkX zc>p8nhS%Zf9_o)K(Nu3Fy&F76?dJ0#e)y?LX|{&H%a|nxQf6lIpM@rl2s3Q0#rW9x z3hUT7{`!RFF!B-}&+!@evo!?e=q_QkjdV$=i7gbQpgFBi)1}}H8aH8Uw$Vmgu8u6$ zhMil%J$7UGowBq$^f*3QlcRT^ zjEk-)dXmsGuI#H7&QBChf}?~&YpHQxD7}*<(j##iu#&E_eo)vwx1L6S@u*Vpi%zIx z#w2Q2Uf-0g*FsTNOZSqA%N^yh@|5`TKnK)Ug8a~j{OZ2NQ}7z0yunz;m|;uBozprG zOmi}>HGt;f{k82Kp;G>nV5~TZ`;UoAnJp$1m=AK86fv&!pT!_T6%c&^5a%a|^D1Hk zp{`|GoQy8JdFcHLt-)5m$b-vg{P%-CEUf>kC~@tx4A^~-5sMtdTyY*ZfkaTbW_j#~ zQed81s=nE^(Q3gidL-C=-$JZz3Zs_9^&?W>)U2oiH?XhVpx;+3iRATwLo|C4`B!DPXm*E+GB zQp#NG>milJw&W>o5q4pxbBSC7OjE|Dh7nxfOVlJ_!9rU?#F% zl$l8Nfh3n(iqp*CR@S>=;_})cDin}~n+ND_{eq-}Aqy9;8p?}FTLps2$G6e?N+}B( za^m^5bGIY0hbM}IU>-jM<-m6Y1-@1nQ66dS^nr@dla7L$wE*xS%RSPtDY5)+|%|$ns5Y5my1zpluexButuuBYP zTGVqqfgw?^Qwc;Owep%*pay^9pLltNIB9Ql0`fR<%UXOQlPWb^(gp3`p`Xz^9BF~k zfFHK8bifza8$%$D6XnD5$ESjPhk?BP2G_|~SgNj*HU2nXOx+NYgZI&@G{!w;6EXgN zh51~rqw19HZQ7Mqv2Q2^NaDAONL#&MKm#J7h4k}ou$55^EazFQA9UGX<7~G#ZhifP+Mn6D z&v+nQ5=K8&im3Xg)V6x;DCy11r8ky^R~k2b+pmD11t2W*ndK}r$*`M}G>IaJ7^l=$ z-KJ@oAh;6)3t;aH?1E=w`g%^3N3!_e zzWO_gb1@~HxwtJ=a|p1aW1looJ5^R6H9*VJ%OG2rXJ_iM`u%#TeStH9a*>KN$0{lApq| zkNxkz%H11ItjUd}i&pQLYA-de$T9TKUw6BrkDD+c(n9~iTIC!V#GL0Tw>Ei-CBrA< z;BuyA$_}$b`9!h${Em+*!)7+m;hNPbuNuO;BI9ecfYZa@C6HG|nD>-4Ty?M*kvw`7 z`Z4>!^b+)v2E694B{|-Z#3^;8=dg_tYS`bxrkXErl+CJ7_x>=)`dc7xnAf-MA8W^T zhGCX0{kyZ({V4n1cdE7Oo~7AEb^DFHlf*Ihu)Nw7!D9}*5yS59-|AC&PyzAfoDe$T z(>ts$0ECd1v_Vjj!&`~%o3JrKbSi70dq*Qf14VqCHNM+BBHq4we@FOa!}5w7LSLSv z6BmrOkI%*AON#gAG7H4``Ta8*ATHQW?+rB{Wmu=&pab;VD%30ej6Ly($Y%lhd%|4; zG;J!(njl;=QUbRejeXByx?yzb0RzvjDDz7DL{be`VSFSy+|p(;kxB z^sz5@{_poLxZ6S3ChFAhjejWQGMrEA)BcO9`~2f1-`I%M9OLEhW~uziB1Cz+4z;a$ zkAlvG&R^Q~+w}@RY#3P>h1`j1FTgIC)Pk$;jOa#oQs2# z%-clOg%7#zaihnyGAuvW+jWcC!qZCk%sH@G(=-z6280u*)MS1|q8wL1dq0_LpCrpJ z)>Riw3|M$Y<9`=era#;S%cTe_&__j*nP!BxSn>TJ9S@H1q1X1&&1)Ai(Tyq8FQMv5 z2_Oy-h(JAl^?EnjEM|0E7EbAmB7oLsw2U=j9=0{o931o&e|hPUfv}f0DZzagv#wba z|DGv~haUU7E;~!h1Pw^d034gvlfO0JeY*xdHx%}qy>hB{A6jZ$FwU*&fTM;l7?CSExuJDxyoweuQB^sIm?8c*7QlIYwSP#4L|XJ66h4T=oZ2^Oq-0R z>CnzHaaSMWZL393IRLL2plSX5OZU_86b-QZ@AmA%_$|Ph0!XSHfDX`(l18cyiMe(` zPj}$0PW4A|=ZAQ2d$b`jO7!Hc6WZ!jCH=)SV!T|t?YV>wv$r22C%NXBB@@R{9Yt$6 zU>nxe;?n^aK8hm8muYyAuS{W%># z7+mXx@VV=F#umAv$-&KFbb-qgxpDW7&ro$Eb#fWLm$Lw|_h}TrIR~=uSH;EeO&?|k zz#Xgm6Ejk$68_hu(aW9YablH0&u~ob*hbP%W@}aCJ?H@Z*Q(g~p6vn9-WTu)Wb$ zKhpTz@Uh5+GOeX1*!!(n^E={$r`4)r6Lq+Ahpm=xmf;!bY&b#D@0|PDz+Y?)nD^rN zxB-6Tc>Y``5eTh~cDrq@a4(+5}=z>w|H z#m4RWBev+mbRq~GqN)MJi3W9|+VeB|l^d8Gb!eXa>XLv3ocwB@x1|AX_!{Jmx+HYd zyGq4&K9YTwxIelum^ zG4_3$g>TrcRL+>car1z{HvB&=2Zn%IplAZYf?%&x8nXiCfU6UOgu2%kBhDMXj5X>n z1{te7mxn>QgFt*TE87{x4r{AcUeq@6Uu84%Dq`9+LX-ydux$54IjWi(nO70(+vvup zi86x^7$#cPiV;5Y_A82KS(0uw3pJAZc(1efRhZA)bztO`x@eKIv1c)&k z+QL~>1>Z}jp$llp+-J=P-L_A8!d7kwc3Vx0^&#}Sb{3!w2Z#fEZyAy}8nvlLBp<9eL zkp7GEZN=JO)vle*`=;C^>+hP?$-d0s5>4kV%}naJu*nz5?n9*)I*llQWxMUs;QI^R z)1Mp04>)zmI9cO6`BYN-jUx8L=Aj%E(v*!u2w^;?phF8{B!4;&chrOC~K z-6|wZel7;zz+z^q!I#d{>`hW2ssISX*;{Y+>izUepz^xPSy=y7qj+OSV?Z<*7h5J) zAb9L%2!Y5gr$*g$LuB{W((<9(8_FDaZStdXRt=cO#C9ZFf<;c>n`xwJfu3g6c6H+o z5sOz#xBQf&y00=6X>KKt)1GZ^)FB!;8EpeNg6nA#m$m98O<=$rLw$2FK>~ox({((4 z3ps>&`h2Oio%v!ucMhJQp4p*+2i=!C z>(FX$&Fzhn(3HGExfscXgiE$cRh5+B%S6L#`SgJ;EDmRV-;>P6%l>aeO-S5PH?2}O zBP`GQC+?d7hv-?FF{H=(_w)LRMsvfi>j-;O5njOc%@O+rOtJO!I=74}Mm>7#<1;8+ z%)Cn!>8iM>^J-RshJmunI&1XUN_>9lPjNM0ef{Gz%WEbMMG0 z#X>!q{oODkHhX;%QrSO4Dzk?tV4CB;%g8={B$z+`Baw@1_CENPdp(5$b)bvyQcOcw>pH!(k`z}Nubuj0cRhN8t zZH^=yOT4p|V#Mfy`UKvchU1}h<30u?$l@vHO2D$HLhq75`{wWNs=W|YEDl7=YYuhZ z1uPiZeEr+XX>SmDFaM=IvV$dD18bJNAGZQA*j+31JmKbHWhjZJ~tF zIt6|fAB=9wE0%Jsg*Yj@UzA9vdsK(^utw}d`nam81(ZtwFBg`4Yp?DrcQ&nkkUDa3 z30z-nWOVwU3&tgMNGiZDd{>TgtSeHX45qi9!gtk@csb<}lwer|Xctq7dw@j*W*Pcp zo6BC)cF~@8=|vBOP}&8w_D7lCt*G;3C!t$>aiZRMOFDki+nxamA8Mr0Od#{``g_2yMeCyD6!kd0aa#;yydj zvcDBeafp9Fb}Ov`kuN=&Gd)cWS;p;6MHx7%v}gW|Y`xbVC5DFUe2d-a6TTR}y#G~N z5XC3DWJbE9KsK=Vn7;5YxPnE%8SV^T`+LOC`6T{i79Yy0Tp|j)P|y8g90*;R!4X_@ zs5Lcy&uy>_^6#BAx^L66oI9Ku;Q(yiUE}t^N2{-_i5@v85X_q9Wm@*}r84J_m^AXn z29e5-PEaf6%f6o(NbZf+bw_HB6dL#F=W!p^K66RJFY0dMj~-KDnyn}BpMr8{L==#* z3y6mAh@XU+^6{I1iZa)6{z!yax|DK%(?8tD{Q?})m0s?aJqAgPE1Zj>) zbT?{>D;*trfuQIF}rHDSq8q7jR%ry+lva8K)doxzVjA#PF7 zwy};Y)UpuP-8Bq#>BF!^yviLzD{Y46XSmeErbGzh@t4x}zkHRLaqfA#rpa9b6nw@K zE*4G3yM6&-2|2~|B;7#Ap8WuDubwM7XAcs3n9>55O2mt@g#a}m{u2`#q=GULwCV=j z#&;-aeUq%@;{jTw&Slawi8vxdZoW?(JpIHXmB$E$*xR#c#{J#Q$O@Osdg#0wJ5Z`NH)#TyV?*K+lq6Vxv|&Z|w*z8UNb-a~UiK01(ugq#fVEU%Z9 zZ;%SXtBn(#>U%w$9U$i)BtIUEL`KYige!~t#ntoZ`5C9aWGpaVT1pK{qMi=vvecTn zO(#Vs{4IvKYYmbk3m!qC@L}KdWyOzO6C1Gp3w3CA&~X~g`eQZCkdMhN^yC9B|7qdZ=5NdW z-%{>4y%1VV8Z^>z1u2Om)n%~$&&;D;7K5T9%g^L9c>$>yn%nS@ zm+B;=K>MfrDFs*qu?A|u*tKPjyF9JJ_1BQ*o2Koban5AF3qr977@vzSpp z{n*7Y)omy~7D4q{Np-r_FPQTn9;&rh-Pw|a5$-EmoRT7j*}WV{YAOQljdT|N3<2{R zi!O26wVRq{OO1_opAyz0f0tTD)tzsAL-ImD4U9nz-G`uhZ{Z*Sa>$zhPY~rX#Td#m z=r$m{(M(GX0P7}lw@ZZ(ET4OR2-TI;a`gQX5!jVq6cQ!7ml;iy{Dy_bDq}xRqH!FQ z==`el@;P;OX0LtXjfOlBMKpi%!A)?!B*BMS`$<}F%)}n?o$YaBmHRZ3naAacHR5C9 zXz2jeoXd}W+)^=N1T%-khwEd<@0}&2H%TtJGoH1^2eVjQLm&ziq-~DGh9ENE7=~6` z=Y!Tsx3#6Z;E$5yZ{~RRYh>UwY?2L6&<*cxvVNHI<9(K7z#h2h#bdTH5OAe`<3k6o zIE&G3A*H~HmpL`F6&8%zI&+&NUtsZg7&Zk5)O<}+z z{8^{{v1!lmf}$*K(F%XvV@7ouD*3cDL3x$?F$#a82PhHWr#nKK@HuYyQ&J##vg$lc znF$wvZXJ5!$xPc2@?)fA4qC}%vRV8mkF9+kPhezkDZ}; zNc=6#O}9Wg0rB;{VqH&kN>)v1LGAm>UYlcy^dSU=`X&vujE&qR2YY@-V3V;5B1Z}p zL5@)EVz8_IFcU|%+(K`Ve{~em6Wc($>-|?mPQRdX_*Y%Mv~pzQ<3l?LOz)pOJy6opY z&gpk%Ff%5&gJYW1h%x~xyVJcPa8Bv}A5wmrpN-x|%@Ng4y!`EQ7GXNYk27Yy`Prum zp(KllK6h*qbJ0Qu)nO}Z*uia4-}Z6%(EiC_0O;7Ib_QKTO?aD9yrJ{qq`!6AU1 zR;J-J%@^y+w-#cQ6tHY&f3c2pM`k{BQenWQNN?=-{8nmJwG3<|HDn&gG_C}-Il6s& zf$3%s@oQ>#TKLa%b!mAabOSDQ_U^(n-eWh5P4pAiKC1ws=m0*hmyafT%Vv!*>ujD+UwxL@|M5n)Pik)V#3^QtCP7 z+%tEd+adQ%k`KQd))LTVD<(qcaIIRPjzusZ&--0C8L}bM6;Y3BrrUMg&S)Notwmxw zg+iWaa#G@8(1e3YujDMWH-~SLMrn$R{iP$!5jJok#{dH@nDh`MsCk1Lv%5DBNv$|8`{+zUfTg_BVT!L+!d6Sesy7^ns+YxpyJ;q-+{;Y zwgcGmHGJ1=3y(tyxDN)-(YsRafDx1D;=ukzH;Gp4lFMWucjGG9<9-2Lc{j6l7*)o8 zA_?)HIyT8g)TLu6MyJipI3RGtNxaDly@^O=?L_H|MoIkk8mw7I@L5*uU5NbGMrcOG zeRXm5LMF!7o)-f-5CVWTu?P`#}rB`CR`Cu2XcWzfvqdlBi zf~PETOqIAN3R#WIrS`z_^-wgjnTlgV?VfoqRON7J7BcXdfCp(m!2$icZ=1D&o$_X-xi z?vOD0!G9e(SdD!pj#&d+FKIc21 za2R-vLv+~rLA>*u^`9H}2_W7-|DdF9;y9r%oxA&~9g<5~I=CZ}%P$=8yFDZDa^u`Yf8vE{<`*HosBGp#j(lCyJlBicsj z=?UgDP*Ec8s|UInobc-S1gH923g<2Hlz6_@n!$rlbi&W-5!%iC+;9HqZ4l^!w*GFQ z`cCXaSNFKK(&CymRRiC0=DQ6+f}(K7?6+XAyLj4Kw%)i_jhC;j9-n-Cnc649$~amkDHQ^e&3YZscMu# z4AjhMuJL!$6Zynn^AEEA9WT);z7Pl-evNbx0(1!^u}+!%#9!~b)&%{ z1+&x#+!jy(px{nbR=5(f&t{9r{WlC~kiM(#g-)~ql$J5G+iAN}AEo-kQ}NxR67+Sb zrD?E;5`*cr$vKGHguL8(BG`tC3}u!Nxt5C?iWszmckteu$F`RuKfY;O7Z5+v#CyZp zV0{;3ot-%j-h9S7lH49m^VqYlJOB|uA080Bi3`Xt(Nk2roh*te9N&xO_0v*?C+Id^ zCt72EVZz__X7qXmnisXBzE|P3ItAPV?_6z9Dl_SF2B;=GRoBUW!usS=tBu_AvcHWk z0uCqW&-1=;(ryq;t!w&n+M5mOHJ+;!_AR5v#l*abO))tO_A$PM;o8$Cn%SSdf|W5_ z0u7S0N=MD-+To{=X)HB}zA3xN1{O!;sQy6%D|dsnRgT7L{MqXhmJBIHVZ#A+tlLSj4tl zVl5I;Ncq#{kxDijV(1Ptt?+_6heKHfh(CwRB|-uQ7t1%DDO-le}x zz7a^;g{3mX_~9HzTYn$fwfYX~gb@B)c=D~~>-N>jm8_JI$)peyoXzc`&c+>V8CnNZ zq8)9xo>F?)-;SkEypi7smK`Mih`(PbUcOG*mkeCop29O)C-o21k+^hUJ^Rp42r)J83X8_HoRr}Fe<#tggZpwI!?e-9~P4af?(%Hz4YqTz!*n@TXv7t69~7S0@zg) zSsNQA8uN`${gs-xHWD5BPZ5c(#@+2pJdzf}V5oK%z15GK(!QW8FWB`U=?9JjsjB-H zyzv}C-mC@q-0dCY6BGn7PkpFt_FlP&lzh@_{OmX$9|e1};d3u}u!>YgSvNlH!@6$I z1;p%wVSH(Ckz|R&ioB7VD0+_EdhNhi)y{e%3Bo14Vh6M|*B;}7VX>l;dlu;RHCFqU z$-CZ``6Ck2MtY!rJhSDzdnvAc!)`Yixc5!lOKZo|E6Vs<=qBrC`nL|W;jt1oL#QB# z>}DUt3XiR%99?7$L)LxB=qh94?RgKv?|qku1NTek>ijHz@RiPn>~s5%>H+o8S_1U$ zpFhKYc6Og?n34u;P}E}^Z+q0NONG5%J|QZqXp*m*btMe~nlVMZY0krlSB_$p@ zvs|~8a>KO*NJfD#-JU2RopJhw6S~af{^LGy(kWm-wo7EQl8Vkp1(W3NBL@*CxAZEn zyuRdTk#A+!qKJRpVo3thw2*}Rkp3J#j~=ONFebd`rP`4^fAa=5`D{J?n^wof-BIL& z#ABgrP>?>&0ZV(GmomheDO#EjiRf2=z3_iq^`;3iT`YY6(~T}O*?}S-4?D8|4uzp@ za^17Wk)5R0ob4f6a(eE`yg(LBdVEo59@M--H&f+dVYqTw zekN(FEEjOY|7b$m3v$;tt5>@Lm%>M|zS!g26AEB`H*`^FqBX%H>eNE_L?~k{j^Q|FZgbvc#W#Vp%Iu$K!TY`_2p7 z|In}C=n>cC?x(y$LS`b$%>k^fv79N&JneGHZQ3HyEd zDB^J*Tds{TiyYI;Q3*;_=c1_b=1aUgkf886I1zE6G* zvdVO({nO?68UqIXMqryJ!(f>dNK|n1dV>0JO=tjU+xYARI5#QF_BSv~c3hJl`H>nG zv>yE&&a1vTk+es;=V=Hta@DneGVuTe^}2oj@VS3-;0{H!F2pxe=4yW?>@`E}LtsBR zH7rpmLyjb{Ko?G9z5b3PukV1IKG_|(u(8Xby!7Ei)?gp`kDX*y^fiSyfn4uWu_qwQ zPr|56B)Jc9OrP+wNRN`oXlF&UGB+&6LJ2V}i(#(2MbVMRw)=-gYU?gm``6b}FFA2wlWdxE`17KzoShygfCk{jvJtN9`@NXhe z6V9#qOl~8?udBnP#}O7kr6Z%F;D4DL%rj(&U`C7c+n1Y;_cKgz9c_|uvS^~)nsE7c zEacE&VxYO3Z+d2DUM2r>1&t&Dh5H9Z%8(;?;{}Mz> z2rHxf(q^+&L2*~uggl#EG}2U&d|dJn;C?0A~P8cKuUlgDHLjoYA` zYJ|^--AZq5%0er`m^c-C2f8^>-iNWh*Er(YccBmMCv^PY%xhptfn3gaqZO}~7{Sb! ztg%mdt;FndA^xB!y6W4;RnK=@pv=Lm5N-s!DGqM%xd#zClgrCo%C&bYP(xoNxG(p= z6xKLaHEZ|jXD5t#s+UIZZC|BjWxBa!kMwjNnM$EFiT`vYu?B3L_O4fFS#Im*MQEuv@npgZA3^Qn zLADawSQ;!~)yNQ>TxrYGDEd;TTQAHy)7s5$^FcpO^V=*9R%e6kRAh^cde%vC{ty?| zm~};MhoWQ)@O&zsiL*IPWAdZ7MiFjsi+}OL5F59_aB}=TXLb!*DmLq)8V>{H+B0nZ zpL)_{G~OAv0uwDxaewCVR&@~=-q;Row{N_P^-gg{@8~73e9xNY2;q$p4YIFplQ4RU zDOdeG$o*0{#GO7bJ9O{M&gkUm2kp+gbxPcTzd%z(5p4BI(3~e+FXDrJ)(3a89!otZ z`|`z+$zAIKerUy8YmvF;x=aJ`mK?)NOB z7e9mB3dmuiB=^{6WXabg*+vN8}@#zK7suUl3?P{G48Ax5-Dt*=0Y*phULM^;wn!( zIGGc1?#JE;xhJMbHQc>W?n|2cqqP4^j>G=+@~B3l7&fa=F#(Zr9K5o_cV8UEcb?re zOKWxMjy?$E5|Wi8@H}G&%JSdB@wy~m5dPH@9?{zd;VT6CdXjY#%%r%}^}`L(~%XP@8g)j0T^18i_OUU^j~ zWI6nHvI(8UXV)L7p;|>pv_iAg!`l_OjtPy{#)v0r==2(vjyKTo}py zHk~vDUMU6}$1WSIoa}!c`KXYsEo+=b#9Xl#_af6eOMO73U3Oc;5yYoPJeUE!L~C{P z{U<4>kK%BRfe!5_%+5uRu+?m`#Zc>Ht;=!C`9A&Evk~N-m;yi zCbSRSmJ~jXriW{2WUA8T(w0gGU2HF^fLHoVZD+ADzi8A~|8Q~TKwK}IzAgnWx_uZbZxU7R$ z8q4%bSp~lQ5J+&SYW15=-X~Vyop4?2QcOa#+NA!G=yA)Z_rH#r?tyvUM{ESX9pn!& zhv0p5TpJha?RE-#e!%{}wB~l2dAJuxFdh|UE`oV3S<0!l z*9XNCoChmt0P8Eoe+Ak6@vQ`thq$1yG{5lcyD6>Lr#&u!bH^wrBDd)x!lk?l%N6;d zsg~*YCUy6H5QZ7A)C;S7F|~xyUe>rtWt}=}&}^lPuHfO_5j?BoBEii8@^U_&fy=BF zVp!Nn2KA{`(tUMyLf^Ky3>m$bM&GYP_}GYH^s`^(LI{U!3n;E^D(NR?EbfPD1!v!Qg~do8Bs+PShXkI81^Fm95%WNp{ey!sxMi_H=VxM^G4u~#XZQP zJIDMbjq$5ffb)WCz00nH%7$Zi85TEEeac?T0%?PS@AW~*33|1=J8Df!nuG20+q zmg_z;ddxm?_;JGKDD!od@X*QE?yR_OkX%7u`6jClKza85jC?3PTt-i`16ABwLNLU* zM71DY<%ns5&=G@Esf2AVjq$bG&#>^Zre^J60#3pL?UZb3tjeQ^Q;w&au81Yke*hG> zv%p(v(a~#}n^f|ZTqeER*3?0i`^prAeC)XR_fK#9wWSmEyGE-S;yt)~wh*2L9sXW47 z0_AmVXc5XO1kZR{E~~*6*W12}9NYcRX2g+)p+JixP~G_@u+JUU+}Z~NA1$CzlK&OE zExlT+5L!FG)vn}T)dIAd5jd+xSYl9sUWaBXHefq5Y1;TFmL$)g$$Z6bMfH`eJ{rzk z$ev&M^g+J87!A?qSF=bLX8i(*9W1SXb!aQ_=9Abzz{Hq6cRRCt(f35vHev0XYO2xI z3>&+?U^V=JtZL>zBe0V0iqqqea>`QY?0)5_KjYp17~kOYF~p$H^!1{Kw7BwYQ@F}R z#d_z$epcPciY0b-wV``L*w@wD=@mvnyo=(#o&>JfQM-zd@>g-Sc7vf%c?GD*b z_mX6*QYYT#Kis>_RT$#=Dc9i6oEL50Qx{^quzB9x#YBZF&BRv3D;g1uw%fs$sDvbw zi3Lc_xbWu7^BJ{Pg)5+;JSrKt7ymO#dLW?{!E5ml?YAtxBMG7DZx_zL$R2~6Jr1+x zz{5oTpL`mjwr6EeC+`2+OILKYAUX)qB$teDWfF7FWH+Jh;pWSHh zB4-KYAb|ix>?lp}pTA3b)NQfbs}&w9%+@@B=?)&~cBf%O!YfP7AMGyRYYnV98?yrxsbe6%SuawzOX*-~Pg%C7_uQ z&zw8PrIkP-GQ>0zM3m~E>&YWOAqyf{7-mYi)>0D`&qj-FRxbDOIJ94sB1di8BOZ=W zJqPeOIvcEvr=N`Q7Ih?v5cX}%`(id<7>5$U!Iyc^%;M}q*3WufUaeiw!^&CG`h5bY z@vU^31t7}ZSx7pfozj3?AyGU8xB6u z_(W}|C5xwPgJ6M#)(66t5w(BQA`tSXfUC|sU+W5K?oH{na3T2_uyhbO6E?Q#4fxUI zz>Hr5l}`kcD_jJE|L+XcDBzOVWsurA+ZgyKsWbtapV1!!^+c+xF>VobvqI89-n(N*y6%-MC`jhYgx1#;H|&_I^(ZBYUT-9&tt2V#VTQ1+9!zQiF&8&E z-@25={n*rYre+rbVMLlM623P%lXEaFmx2z`HV}!o@^lqpb^fJOG_M;+GN+ z9@|Kro?Cd+<;K9bv3J*Yt@{kXZDwL1(I3(`MDwXtpW)`XJlbkOU*}qxUdznz8vvfj zQkh4RWRW1Jx7njUIiQc&v(1l9R}3oi;L7Q1JK z|7+>2!HBNVfbc&QnNq2*&)X$(pkdhXV9HRuJQ4pj<0Ricb4Uk5 z;>>f--@8`V`@P=xeV*sOKlkdd51anP?@efVwCj_VW&|gq3Y@3%5@zQ9227P$`1S|w z6Q^&pBytqaJNI|eNky>%%_J)*7Yq#D1C3D+6Oh(?uV1CXO_9er{9eM_l<5%-s2^cN z*X-2I-QK1xj2+0XFsxzWn{u+JbWx~cCH~_9^j;k7Il4OsB;C97e%g4&YaZ+Kp3ApK z3^SdB1)$dT+4hyR`1P0!xC3s$qF6z?m)X3`?V5XPTL>u>w|||~5dMN+Et;src zBl{TCC;joQ8|YiBZJ}mmdtTKqzYR2Q5Ci*|bi@)c!~=3fcVZJcKH!N>FGMS6ZVpfg zES-mrX?jojrQldu%sx`we6Gj4Bq>zOBpPT1rw9{H;`&-MDO_}xxee?E`U$Axn^ar_ zG|JUth^uP}w3+s^mi9^hIyP3>2`jTPdE8BTc-JIPiChgrV2g-2+b+I)*|gb9*Ilzp zx(X;ox4(WY%@B~9`IDjB83ufgs&5A?sP9`8&xDOnm#n>=kT|HvPlpkwxGY6)@c7P5@(p_NaWpO1i0?C)&dkBrVkT?*k57R}Z(-(RbX-{#UITSXwd~vY0)LQG$ zi)sP=g4m9seOpIB381HZ%6I+QsB`?jH*%ax*L1I*RI)q{RV*qr?_Q-gh zZ$9&*Uu+~qNh#^hz-{NLkimd)8Ry_ky!H@n=Wf*B&VGq4+!`;sWinFRhl9e+UGC{Ux~lS`zs^-lo6^CrMg^zD zAOC28XkEA_8Q&>yO;bi{j<0Kk!HJv}PKPNYdY3=Ilp>Ek?LIw3o+lOCe<`{x1DmkH zsl?*rs2>ftXW>@7yS>BmdcKesFOG=Z2y-Zohohi3ZP(x0dv0Sn&Gxu^2H9kAhv5$W z&yOz5a9o^RQO}j~%jN|NxdByZPsTRRs5&7W%x_z-s-EzhF7s3k z-f*zsyk_qfFjd%cVBB;^Vnhlx0XB65oS;7|XRBi7#N)rA(sNX%BgXv?zL-V^4#*}O zjRXVzj8M%M=x3;|h_mmWh~0MI-Y2fkJ_cCD*YTeqpoXvR-$3@KlfDvQQ~M{{Ls4ko zjujcx2`--%qD{x_L^%z!<^*PU_HeEK1TP(d=LX@UsNtz5CN z86&+gn&_GCulTX}Qj*SLOI17j8&6htGe=U$%cm|D&CjC zdSEMv?$)REL;=3}*lDI`t8xV=cf3Y91m>eEoYOe8+6x?Cg_;n{3K?Bug7!978YS0~NOJaek{IC#s% zlso$AUfInPp*7IXA`ujE$ptm>4cn(Ycm^l?epvuabua~74R@r2-Fl^PGn$KJ zGoF6*{rAZ98RzE=*F*c#)zAz8(T?qub-tN>W^5g{5N4Mpi5r_{!p8Vzdr|zB^R6H{&#pA@rBW#dlnrQv3S~FXd{#1ruAg`0QV-COAe2?}cwryl{ z)PMA4PwltBD_en`hH4X!# ztatB+Y&*BtEfB5^63Rf}Ub1Vg$A<8k}w@N zLtblmjArmC!*)mg0*SJqQWz^6UzKrhVGd}2>WUM$=p&mPiJ2n8D2DP*!8Sf?IliXW)7kuE z;U<4CCd7FCsmEas$))G$LGaBv;bCjNONP>uOj>a0!$KUFq7U9X*k}WB^F>c$=}=QT z5!VE~cegY_N+f)`AS(^=sO6)Zw1HyW)_o+!xfH^AP_rA(1{bWz`3A#m7#@TnN8g6e z{6HnGo(75uPng!M?y$zmzv<*Do~}dRK8d>e@A_$Tlqc~K z?bpxR&V({=JbtiAv_`Gkt&y&*XXp`^S2P_Gw6Y+cF0d}c4=*b^`f-PVdrZ6rW`eud z3++(MyMsOqEQ=1}%ZFSW1k7o}fzV!975%;9>k+A7Nx$dku64a2$fcfl)DwGzrSS{w_=Nn z=vMX1E_uztF11B=4YcSx8f^F|BeuwVWMx#Mt*>%Y(|&zbpA%C@ep)#hnXy6scz&BF z*=~Dhx}dIg1oi!d1D+m6hxs-nk;(lGmkQQxRloE-+hf6U!>Is^ftNHnfPeJx(hgPRQtA4cZb-J z{J6Uvq~DpHm_`{9yfI>e^>TjiAvEYTctI(WfVPR!!5oqG#VynN(7vgceE?6qS5EOX z?*(?(^U&47f`V@DKj%+i)8cW~ZGsnhiRP4&b(0Qkel}ol1%2LKqPE>vvYhCBGP~-L zZN>i&6!+Qh6c^G(lXEM!pVOt#@w5bU`Jj5Grb7wKuZ}3zi2VA}x0#bSZ zH&-6#z15TW{(=wfWcpT?+I~wV+^yx@R0PHHS(Z%{8}@=yo{!f(uH7lyu>};La6he zUdVwv>-|?&)QBF>u?n&S9kTU)9Cty>+Pjqs-Cb7f>D=*khAVl&4p-EZrOFX|F^3rV zy!b@1xNiKtTP12FH(ctxfuix0vis1%o+yQypOho8Gpinspo>1Qf4k!I*C{6RzxJcj zO}Z8IBrW+HF+#Z4qGJx)spIxj@_Rb7yp`?DXMD!mjMPtmFLmKmVJ*%oTc-(sZ<)_{ z-*kbnb3?C+=qs2tBAVi?>s*Uo*?)~k+vw*UwmuO-^%*o5;lI9^FpIRI zQQ6jjBB zrS)<6{*b;&Hw9ZiZsnw_S>e|FTIu;F7G6>pN^Paw8B-||iEcq$q_m_L<0v)6Hzn5%RYzix&FX&Gh6Xn|fjE%`t;;CR=U6hAE8wc?rLAiAdiV zF~!)TMnyCwiZyx+sG?doT4i^@vd?P62fi(U(RWJZ*wzQj)y*qfC{y&Ae+{z~$HIE%=?3%cYD|kh{->w$oF|k9FJa!Z_m5L>&AXN z{ti2@y~7aO(LYzyiTNEt*FPluj4->$nutfJ7U@BGdC&!MnL82;O8;mv-@YqRhr2oL zcmBGW-ib3u?RPFl{O2$tU*r(Jc6o3dFm3998eeWbm{y0y1pYKuH29c8kMzBoezO4f zA@Gv+G}|fvrPs42tsI=xLVKkeMY+3(cJ#z8YCZ2~;E)I_o*$y5+Zf@0VEIKXpyIPi zYIEogXJ?~7gxf6-au~9NcI4gF1c7mh;oKk7I-%x}o12ymH5xS4jKwasj%f~z?Pe8C9BF637rFzfOo@)G}Gpt!Er-ujn4PcVb2t#WtrOzQ~G73s4f# zc*7%S{_aGx?$D4gG$d?6_f$#~;$Iw?&*OFxurt%W5S=bie0>6Y(_AdzAo_Ms8Tx2> z>;<3m61GN-(mus}(B|CE8RODvV*(AvHVXwDVE%_6SVw@x7l`tS`vB}&HR z;_cN4pTqe);?F$zE^hjl1EaYK)Uec!)>X93=orB@&lV7*&M zdoQ3fnq*elq@~WEe=1oxS)Xw8VOd1}2SYg1fc3`gp_YS$uDmDB^Tnoz21YIK%|a~; z-s(*L;nWUHW0s(j-W~dYfp+*icTM-wJsBCx#=fEl`3@{6`HuPjOjWFC289(VVBB^r z5+!d==@+=Y>beSD+2lF>x^lZoaKz2!S$+L~RM*$4jI0(9SvjlM&jZ>G@_s$yiuIafG;3A3LZ#f%|+0U8iJsn$zO2)OldgqrK{1M)(*JTF%hc&>`*+}X7|{&?n*ZChqmaf2T*nY_ z&Y3rl*Z3ZRHe6>;b*$0K@je zLX)P>+JQXEAE?>-y|VId2YnLi{u5>uan5-I?iqw~^29t*0)1V{3%}NgwI8lWIGE-w z#{qrOZH+7RKDQL+{0@q^2sP0QC+7cEI$XByXVDLQvB?&9nTrd(hT0P~M7L=D35g05o@bmgb-5SGwcT6O8uj2Z4BdNm(R_jXo*q6} zEvJdqyM|T*GyrGLm48hmyw@X=yAuojCXnfY(v?DcgO5*Y7tvBNcuYY`myXX>`x?iC zF$8tBL+TUaO^65SevYGrM!qg&`vt{*P!xpL=#Oyvd!4GT0UP4(U0t%4)`Z!7JIfz1 zhR@qL`|#6D?3Vttr+DG!FJ-t<7qbT12*Z9N4;SLR*a3HXT=R`G8?*ynl3O}FK_+OP z<*P?Gha#Xb0!Lo5{BLs7d%0Q)Or^7eohJ36tZH~bt_|#o-)G&>`xHH&STizWRE}~; z;%Limbi&`D{vdH%(D0?Ch*Mt8>!2+Wlk8zlF~IEr-%eRlO;$~a;(9plX!~DnE3oDl3n+MJkAY2}i|%K#?QzQuvWfqby{{8y z1~>)d1|;-x?iW}Sd>WTuUn-CG4iJOqqp0iUYY&En9q0U0I%b`h z{vHuk??yK%=b>^AagEpD;Ah87({)*VC^Wt@$R5V!V)LYi^oj-T(d$iEw*0*F7Kr67 z(%~MC3rst@=b~%V-D*po)~^%aRF~VQu4Rr*vA8T-?&kZjvBGk2htE z_v3Q`H%k1Uk!)Y<6bSyvyt)LmUH^JfM<4MVq`jZ-n$E=pNDC=mmDmNg`4{d1GttY% zWX%;?vevN#P79<9?dy_{GMPE){&T)<-3gC{+%onc7wH}gEAm5rpDdbq&#!dND#tQ> zxU;vufHgkEdB4j=C#yt8AWd5iptt?$mE!e1kGEp?hh0m2BAq(o&3G(naEs5$BJdid zOmt2A8h1(@%7h4HX#Jc6!K4$}D-}<^Yx9HJ+aWE{+Ttb2;FFsmc_dm3}(r3i{(Aj)KO8Z>9TT(Zt<^CDMI_Ru;$)SJni7EGP1&sAI5e6SWaztkr`Khw z1y%XYSFBdpRid5=8m{sK>v3>PliS*(0k}l{d#(O*th1LSia+HrDSw~kKxu(&;a;|y z9I?Z73=12PeQS1WnXmVw$1HTs74^H?clHcYWw1c2$jgef{V=$L?#rQoGa&X5d=4N0 z(2lt7N)YFBn2qGd_o*CEl$!eEJ9!QFOEhlZHg~B9^)JFp^X05GgAVmBq;DJ)y!Bim zH!`re(S)s__0TEX5RC-%6VivmlXESy!(#%TTxN!(jNur&s8x0r6K%(hf=3&z8D`8B zW0IC!dVUrnP}nP_l8(Nf(-vU!XYo$fEB)8-= zNwRnOlVUIEjJS}^O#AaOHGWgtG~WMx6vJ#9=vFo94T~ZdhAt&@k2QZyq(A+Z06Gfbv?Deono=WrOx3bSSR0d`W$4gH%pJqu9rI%wCI~Uh54`bk)2? zuF;Cg`FuZ*9dUa@Tp&r@%0pg!@QrPtA849HkiMLOvo-(k@q>zYs-=?WJ=F{Q_}Mv_ zd4|SIKI5KQKq4_2rwD6@>Zd{`6$Osb7e!wDtNw4uJ3B>5)C+Qe5$=X+<7~99EG&I0 zxGAE7FQ-geWX%GmAx&!1?`3Xa=Z3Z}CH~R7WV~=G!py`Q(zqbKL`Mnhe->^zXs1k* z?jw-IAM=`0Imen;)jYL6eiR>?%H8eei7xn2PO7$v+bic6C3go9LB3tH=KOW{nt9iY3kC#Rz|lNh4Qdq!(Cx=R(MEP< zvj_SQaOR?JZ-R6gU;5nbrN>l_uhkqFOL_SdwI)B!#gimsaYbF+raJ@h2jU$2k(xVv zGGFTdv4o{VpXO@3T1K_g*m#yuMlc9u9n7tg!t!ECJVj%bU^!AOo8N)MK~wkg{DUIr5$H^qOh;-oOjQHIe6@jfqb zS9HuIdDx9iQ^g8t&hs>Eo|+g z#V_C!^iZh%e;^3jzk%v$| zq9&PPMZE`@kA99jzFRN3-AkHy&6sC5F2#tLn5%C@C(dT!x9HLb0~%qR29Gp!NKEq_*7X>z>ppQ(1duKfT;w9U-a4 z3fqAVk#mLuV@!>$Q7Jo4h5~P`%4~VET`3V2Z+bM{ zf>_Y4|Lg|*u($z~Wle#FDD6PEWQ{Stdd1sq_txv~5Ka>9|5$ZLxf1`Gic`L&zu5A5 zQ5kTtXA?+e=I{Ob%TL}o9DAIW`gWGD#%RsEYx12Ij*z{e&@N%60|B}l{7$c>%epmb znU=Pk0Tee9m#&#c*5T1HB?<}LPB9WlcVW;}b`VnJRCKUwE_{B2JN6;XNH$FX8DmDg zTF&GpXW6SDNtRM7gl@9NUm~MojXTa29EVB(_w)bF?{L2Kg_4)-N=?RBWa3Ii#=rG> z3`c|F&DR+xQ(9Spt=bDmtrEW(@HTA?u<(MsT%-5A{4E{}`g#vdQC|V^%<`zyj(>HLo8hfIIqu z4I=LI?xiDFbKzq)S&4!aIMP|zDyUYxD8lQ}iB$)c4ZgO2d3*e=(q4x-mvqK=;8<}x zLyVRKEu}n{=(x?(Ot{~Za5EA?hs-%M;%6jJSr1caia7q}wn}Miw8?f7N$waR=c|(n7 z;%WZCGAZI#wxop>`-LF(kfcyMMtzK=4nkM25+LWk7gEV9el`S8(bc?e#ZX9=#H+~7E{gU;B;Fy1jG&@M*aZ(zW~r;2&MaMgiPzk(qc^SJdU={M`j`FUc9%g2tT!48(`xz*K^U)^PaGJBq}* zTatlFnR%;i8LFQ()bBvyegP>KuXj&~+bC=7Kag?)8`~8gc@y@2_Z)ln-ZJ1lzN$>d zGq|OXO8;$)UY6d{-4X^A2-uEBrNAp$m0ktm{Rgg{R@u-lO<&QV*sX$x1-*fuMWTsw z<6@=jpb4vW2JZc5RG#iDqN4A6!ss-mH?fGZnv)k+i2gfzNC`|f$lAVb%w;jEiSqW? z`+zNaXR=FL=Eir^G6BDlkL~Nydxt1H6PH>ef=?~wUl6X`DN;=0{5c#APF6Tzqch#XeB zklqp$6@F1X6OK+aE@KH$7%JGU;W{M>UAh(rKp-D$Vf;u?2Q&YW`5F|uU!=4!x4K#_ zo(cWA&i>-j+-B(YK91}7nfT8`!)c=3&bnkfHydiNY6yj*R1&nt%@*JK1)=hT3Z4;V z9K;p5^k${Ec0^b4Wr9p{6UTZOtj4Ch_;rUjz`J3i;5#I5669aqnNw?Oqrj7I@L4n9 z*x8)%zEEv%wvOv4wjTQ^VnFx^^Rm_vkvx0MK2c_T5=ucNf{!3+6vS4tQ8DxSgVJ(( z{7ymq%b@QR>fSunWEH3Vz~twJ)A*4Z+fqu2wG9kw5;H?#GiAB=68@%Z_Wfz8zi8U>J@z;=CnZ`j0*?e>! z(;M>hQLDt6`MWi|uxbp-pIqkqk|3Pzc)Y_Skp3S&WTmD5tBYonW|`+1-)wUP|F1CD zO3r)%TrDHzCo)62sE2a)G0ke`*VerS1f^S38J;UdUd{NJ2c#_ju`Fr4Z10;77f&apzJx)6O!iR3FM<|Q(m_t7rd8-M4t$8}!>YGvaS`G%`31AZ8p z{>h@KPTcOnbNw;@Vt7K#U7K%Yi9A>-I|_b#l2gd`s15nn*{JA_-|ODytg`^^eAF-Z z`0)_ZR9R*LlxC}Wu#w%-W0e6~2Hn>fvbMPEcn1AcM(M>HwtZCFIaCuzi>yaACN1B) zgmw@&7)a5k$L!e}+5P2zm!wu;(gfqjG?kn z9uQ>Wkc`i2N-?6m(<~sHQlpEnn;dFUz7c#{n0dP;&8>`m?x8-r98$*oOeFyiDldhs zF{z*hA@CWIC%jpSRwwNTu@hph`@WoAblR_K0kyQqEZ=xf4FLVH*BP?z~z$ zdb|MKrX#pj%wliZDT%yPU`?b^$S+(pgj*9|-BH?QTB6J2$?|wV_aOHnn|HDTzVY4$ z_?M{yUf??VD7|Fa{Z3kUeds&h=;ZWCuV?plcX>WfF5l>H`HX16xSmG1c;viq(_P=p z*`Bf`uK4qGjsNIgEzFL|-=vdRPf1w*OTMs{u3a4Zj>GYpF$aw|^ZVxEbJ_@u^iA~Y IbR1*;2YEdSCIA2c literal 0 HcmV?d00001 diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index b3a3fec2d..438fe9b3d 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,9 +1,12 @@ [Desktop Entry] Type=Application -Version=1.0.1 +Version=1.0.2 Name=Copay Comment=A multisignature wallet Exec=copay -Icon=favicon.ico +Icon=icon-256.png Terminal=false Categories=Finance +X-Ubuntu-Touch=true +X-Ubuntu-StageHint=SideStage + From 5742dee34008552f085de74645447f47af5dbd04 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 24 Jul 2015 12:11:07 -0300 Subject: [PATCH 054/158] Adds three levels of dynamic fees --- bower.json | 2 +- public/views/modals/fee.html | 42 +++++++++++ public/views/preferences.html | 7 -- public/views/preferencesFee.html | 22 ------ public/views/walletHome.html | 11 +++ src/js/controllers/index.js | 23 +++++- src/js/controllers/preferencesFee.js | 38 ---------- src/js/controllers/walletHome.js | 106 +++++++++++++++++++-------- src/js/routes.js | 12 --- src/js/services/feeService.js | 88 ++++++++++++++++++++++ 10 files changed, 241 insertions(+), 110 deletions(-) create mode 100644 public/views/modals/fee.html delete mode 100644 public/views/preferencesFee.html delete mode 100644 src/js/controllers/preferencesFee.js create mode 100644 src/js/services/feeService.js diff --git a/bower.json b/bower.json index e13a87001..572438ec3 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "ng-lodash": "~0.2.0", "angular-moment": "~0.10.1", "moment": "~2.10.3", - "angular-bitcore-wallet-client": "^0.0.26", + "angular-bitcore-wallet-client": "^0.0.28", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", "fastclick": "*", diff --git a/public/views/modals/fee.html b/public/views/modals/fee.html new file mode 100644 index 000000000..9126e4908 --- /dev/null +++ b/public/views/modals/fee.html @@ -0,0 +1,42 @@ + + + +
    +
      +

      Fee level [{{network}}]

      +
    • + Priority + Normal + Economy + {{fee.feePerKBUnit}} per kB + +
      • +
    + +
    +
    + Average confirmation time: {{fee.nbBlocks * 10}} minutes +
    +
    + +
    +
    +Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. +
    +
    + +
    +
    + diff --git a/public/views/preferences.html b/public/views/preferences.html index bcc4ac0c7..d14e494a6 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -77,13 +77,6 @@ {{preferences.selectedAlternative.name}}
    • -
  • - Bitcoin Network Fee Policy - - - {{preferences.feeName|translate}} - -
  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html deleted file mode 100644 index 85191018b..000000000 --- a/public/views/preferencesFee.html +++ /dev/null @@ -1,22 +0,0 @@ -
    -
    - - -
    -
    - {{fee.name|translate}} ({{fee.value}} bits per kB) - {{fee.name|translate}} ({{fee.value}} bits per kB) - -
    -
    -
    -Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion. -
    -
    - -
    - -
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index a68d4fa86..68f3f1302 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -398,6 +398,17 @@
    • + +
    + + Fee: + {{fee.feePerKBUnit}} per kB + (Average confirmation time: {{fee.nbBlocks * 10}} minutes) + + Change +
    +
    - -
    - - Fee level: {{fee.level}} - ({{fee.feePerKBUnit}}/KB) - - -
    -
    {{tx.message}} diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index debb853af..82a4f1f14 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -16,7 +16,8 @@
    • To: - {{tx.toAddress}} + See details below + {{tx.toAddress}}
    • Amount: @@ -147,5 +148,11 @@
    +
    +
    +
    +
    +
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 53a9b5703..2260e92c5 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -429,15 +429,53 @@ angular.module('copayApp.controllers').controller('indexController', function($r var config = configService.getSync().wallet.settings; self.pendingTxProposalsCountForUs = 0; lodash.each(txps, function(tx) { - var amount = tx.amount * self.satToUnit; - tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; + // gregg hack test data + if (!tx.outputs) { + tx.outputs = [ + { toAddress: '2MzCXF7QW4ArgiwDTh12qU3ymWNZzNsrbLo', amount: 123456, message: 'Bitography, Inc.' }, + { toAddress: '2N9JWQkJxbpbW6M4sVaz2Yvn4yczTZgZZh6', amount: 76543, message: 'Chipotle @ Buckhead' }, + { toAddress: '2NFvpdtduhJzQaJcsx3Hf1oJ1U4ouUfLiFG', amount: 543210, message: 'Grand Decentral' } + ]; + } + // gregg hack test data + + function formatAmount(obj) { + var amount = obj.amount * self.satToUnit; + obj.amountStr = profileService.formatAmount(obj.amount) + ' ' + config.unitName; + obj.alternativeAmount = rateService.toFiat(obj.amount, config.alternativeIsoCode) ? rateService.toFiat(obj.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; + obj.alternativeAmountStr = obj.alternativeAmount + " " + config.alternativeIsoCode; + }; + + if (tx.outputs) { + if (tx.outputs.length === 1) { + tx.amount = tx.outputs[0].amount; + tx.toAddress = tx.outputs[0].toAddress; + tx.message += (' ' + tx.outputs[0].message); + delete tx.outputs; + } else { + tx.amount = lodash.reduce(tx.outputs, function(total, o) { + return total + o.amount; + }, 0); + var cumAmount = 0; + var cumPercent = 0; + var sorted = lodash.sortBy(tx.outputs, function(o) { + return -1 * o.amount; // descending order + }); + tx.outputs = lodash.transform(sorted, function(outputs, o) { + cumAmount += o.amount; + cumPercent += 100 * (o.amount / tx.amount); + o.cumAmount = cumAmount; + o.cumPercent = cumPercent; + formatAmount(o); + outputs.push(o); + }, []); + } + } + formatAmount(tx); + tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName; - tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; - tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; tx.alternativeIsoCode = config.alternativeIsoCode; - - var action = lodash.find(tx.actions, { copayerId: self.copayerId }); From d61ba5489935846be50288a86f62f12cb9af788d Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Thu, 2 Jul 2015 11:06:37 -0700 Subject: [PATCH 062/158] replace outputs list at bottom with expandable list at top --- public/views/includes/output.html | 41 ++++++++++++------------ public/views/includes/transaction.html | 6 ++-- public/views/modals/txp-details.html | 25 +++++++-------- src/js/controllers/index.js | 43 ++++++++++++++------------ src/js/controllers/walletHome.js | 14 +++++++++ 5 files changed, 73 insertions(+), 56 deletions(-) diff --git a/public/views/includes/output.html b/public/views/includes/output.html index ee51e0605..905908dfc 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,20 +1,23 @@ -
    -
      -
    • -
      • -
    • - To: - {{output.toAddress}} -
      • -
    • - Amount: - {{output.amountStr}} - {{output.alternativeAmountStr}} - -
      • -
    • - Note: - {{output.message}} -
      • -
    +
    +
  • + To: + {{output.summary.length}} + recipients + + +
    • +
  • + To: + {{output.toAddress}} +
    • +
  • + Amount: + {{output.amountStr}} + {{output.alternativeAmountStr}} + +
    • +
  • + Note: + {{output.message}} +
    • diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index f964a4f7f..f16692361 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -17,10 +17,8 @@ {{tx.merchant.domain}} - {{tx.outputs[0].toAddress.substring(0, 16)+'...'}} - and - {{tx.outputs.length - 1}} - more + {{tx.outputs[0].summary.length}} + recipients diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 82a4f1f14..fbe0fcb57 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -14,17 +14,24 @@

    Details

      -
    • +
      +
      +
    • To: - See details below - {{tx.toAddress}} + {{tx.toAddress}}
      • -
    • +
    • Amount: {{amountStr}} {{alternativeAmountStr}}
      • +
    • + Note: + {{tx.message}} +
    • Fee: {{feeStr}} @@ -39,10 +46,6 @@ Created by: {{tx.creatorName}}
      • -
    • - Note: - {{tx.message}} -

    Payment details

    @@ -148,11 +151,5 @@
    -
    -
    -
    -
    -
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 2260e92c5..f4b24d012 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -431,16 +431,21 @@ angular.module('copayApp.controllers').controller('indexController', function($r lodash.each(txps, function(tx) { // gregg hack test data if (!tx.outputs) { - tx.outputs = [ - { toAddress: '2MzCXF7QW4ArgiwDTh12qU3ymWNZzNsrbLo', amount: 123456, message: 'Bitography, Inc.' }, - { toAddress: '2N9JWQkJxbpbW6M4sVaz2Yvn4yczTZgZZh6', amount: 76543, message: 'Chipotle @ Buckhead' }, - { toAddress: '2NFvpdtduhJzQaJcsx3Hf1oJ1U4ouUfLiFG', amount: 543210, message: 'Grand Decentral' } - ]; + var maxCount = 5; + var notes = [ 'bitography.co', 'Chipotle @ Buckhead', 'Decentralus Maximus', 'Everyday Deals', 'FinTech Solutions']; + var addrs = [ '2MzCXF7QW4ArgiwDTh12qU3ymWNZzNsrbLo', '2N9JWQkJxbpbW6M4sVaz2Yvn4yczTZgZZh6', '2NFvpdtduhJzQaJcsx3Hf1oJ1U4ouUfLiFG']; + tx.outputs = []; + for (var i = 0; i < maxCount; i++) { + tx.outputs.push({ + toAddress: addrs[Math.round(Math.random() * addrs.length) % addrs.length], + amount: 100 * Math.round(Math.random() * Math.pow(10, (i % 5) + 2)) + 1, + message: notes[Math.round(Math.random() * notes.length) % notes.length] + }); + } } // gregg hack test data - function formatAmount(obj) { - var amount = obj.amount * self.satToUnit; + function formatAmount(obj, amount) { obj.amountStr = profileService.formatAmount(obj.amount) + ' ' + config.unitName; obj.alternativeAmount = rateService.toFiat(obj.amount, config.alternativeIsoCode) ? rateService.toFiat(obj.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; obj.alternativeAmountStr = obj.alternativeAmount + " " + config.alternativeIsoCode; @@ -454,24 +459,24 @@ angular.module('copayApp.controllers').controller('indexController', function($r delete tx.outputs; } else { tx.amount = lodash.reduce(tx.outputs, function(total, o) { + formatAmount(o, o.amount * self.satToUnit); return total + o.amount; }, 0); - var cumAmount = 0; - var cumPercent = 0; - var sorted = lodash.sortBy(tx.outputs, function(o) { + var summary = lodash.sortBy(tx.outputs, function(o) { return -1 * o.amount; // descending order }); - tx.outputs = lodash.transform(sorted, function(outputs, o) { - cumAmount += o.amount; - cumPercent += 100 * (o.amount / tx.amount); - o.cumAmount = cumAmount; - o.cumPercent = cumPercent; - formatAmount(o); - outputs.push(o); - }, []); + tx.outputs = [{ + amount: tx.amount, + message: tx.message, + summary: summary + }]; + tx.outputs[0].parent = tx.outputs; + tx.outputs.transform = formatAmount; + tx.outputs.accumulator = 'amount'; + formatAmount(tx.outputs[0], tx.amount * self.satToUnit); } } - formatAmount(tx); + formatAmount(tx, tx.amount * self.satToUnit); tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName; tx.alternativeIsoCode = config.alternativeIsoCode; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c4d19c977..a66dd56bd 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -364,6 +364,20 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.copyAddress(addr); }; + $scope.expand = function(list) { + if (list && list.length && list[list.length - 1].summary) { + var lastItem = list.pop(); + if (lastItem.summary.length === 0) return; + var nextItem = lastItem.summary.shift(); + lastItem[list.accumulator] -= nextItem[list.accumulator]; + list.push(nextItem); + if (lastItem.summary.length) { + list.transform(lastItem, lastItem[list.accumulator]); + list.push(lastItem); + } + } + }; + $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; From d929e329499cfe5f261fc3fe0f37f5ad1c068933 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 7 Jul 2015 14:33:12 -0700 Subject: [PATCH 063/158] remove data hack, display proposals honestly --- public/views/includes/transaction.html | 2 +- src/js/controllers/index.js | 21 ++------------------- src/js/controllers/walletHome.js | 8 ++++++-- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index f16692361..f6911be0c 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -17,7 +17,7 @@ {{tx.merchant.domain}}     - {{tx.outputs[0].summary.length}} + {{tx.outputs.recipientCount}} recipients diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index f4b24d012..586a230f0 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -429,22 +429,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r var config = configService.getSync().wallet.settings; self.pendingTxProposalsCountForUs = 0; lodash.each(txps, function(tx) { - // gregg hack test data - if (!tx.outputs) { - var maxCount = 5; - var notes = [ 'bitography.co', 'Chipotle @ Buckhead', 'Decentralus Maximus', 'Everyday Deals', 'FinTech Solutions']; - var addrs = [ '2MzCXF7QW4ArgiwDTh12qU3ymWNZzNsrbLo', '2N9JWQkJxbpbW6M4sVaz2Yvn4yczTZgZZh6', '2NFvpdtduhJzQaJcsx3Hf1oJ1U4ouUfLiFG']; - tx.outputs = []; - for (var i = 0; i < maxCount; i++) { - tx.outputs.push({ - toAddress: addrs[Math.round(Math.random() * addrs.length) % addrs.length], - amount: 100 * Math.round(Math.random() * Math.pow(10, (i % 5) + 2)) + 1, - message: notes[Math.round(Math.random() * notes.length) % notes.length] - }); - } - } - // gregg hack test data - function formatAmount(obj, amount) { obj.amountStr = profileService.formatAmount(obj.amount) + ' ' + config.unitName; obj.alternativeAmount = rateService.toFiat(obj.amount, config.alternativeIsoCode) ? rateService.toFiat(obj.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; @@ -462,9 +446,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r formatAmount(o, o.amount * self.satToUnit); return total + o.amount; }, 0); - var summary = lodash.sortBy(tx.outputs, function(o) { - return -1 * o.amount; // descending order - }); + var summary = lodash.sortBy(tx.outputs, 'amount').reverse(); tx.outputs = [{ amount: tx.amount, message: tx.message, @@ -473,6 +455,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r tx.outputs[0].parent = tx.outputs; tx.outputs.transform = formatAmount; tx.outputs.accumulator = 'amount'; + tx.outputs.recipientCount = summary.length; formatAmount(tx.outputs[0], tx.amount * self.satToUnit); } } diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index a66dd56bd..af32b891f 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -372,8 +372,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi lastItem[list.accumulator] -= nextItem[list.accumulator]; list.push(nextItem); if (lastItem.summary.length) { - list.transform(lastItem, lastItem[list.accumulator]); - list.push(lastItem); + if (lastItem.summary.length === 1) { + list.push(lastItem.summary.pop()); + } else { + list.transform(lastItem, lastItem[list.accumulator]); + list.push(lastItem); + } } } }; From acf33a54672358f0971cb08e1a6643e438fd1400 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Thu, 9 Jul 2015 14:12:36 -0700 Subject: [PATCH 064/158] txp outputs must be in same order and fully expanded so that signature matches --- src/js/controllers/index.js | 2 +- src/js/controllers/walletHome.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 586a230f0..67e8ab81c 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -446,7 +446,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r formatAmount(o, o.amount * self.satToUnit); return total + o.amount; }, 0); - var summary = lodash.sortBy(tx.outputs, 'amount').reverse(); + var summary = tx.outputs; tx.outputs = [{ amount: tx.amount, message: tx.message, diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index af32b891f..9d9c431e7 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -255,6 +255,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.loading = true; $scope.error = null; $timeout(function() { + lodash.times( + txp.outputs ? txp.outputs.recipientCount : 0, + function(n) { $scope.expand(txp.outputs); } + ); fc.signTxProposal(txp, function(err, txpsi) { profileService.lockFC(); self.setOngoingProcess(); From c18fca0d7ad519bc01f82ffaae0671e4110b7cbc Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Thu, 16 Jul 2015 13:31:46 -0700 Subject: [PATCH 065/158] if only one recipient, do not summarize in views --- public/views/includes/output.html | 7 ++++- public/views/includes/transaction.html | 6 ++++- src/js/controllers/index.js | 37 +++++++++++--------------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/public/views/includes/output.html b/public/views/includes/output.html index 905908dfc..82f324b62 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,10 +1,11 @@
  • To: - {{output.summary.length}} + {{output.summary.length}} recipients + {{output.summary[0].toAddress}}
  • To: @@ -16,6 +17,10 @@ {{output.alternativeAmountStr}}
    • +
  • + Note: + {{output.summary[0].message}} +
  • Note: {{output.message}} diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index f6911be0c..2ad5ecab5 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -16,10 +16,14 @@ {{tx.merchant.domain}} {{tx.merchant.domain}} - + {{tx.outputs.recipientCount}} recipients + + + {{tx.outputs[0].summary[0].toAddress}} + {{tx.toAddress}} diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 67e8ab81c..62b8b7294 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -436,28 +436,21 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; if (tx.outputs) { - if (tx.outputs.length === 1) { - tx.amount = tx.outputs[0].amount; - tx.toAddress = tx.outputs[0].toAddress; - tx.message += (' ' + tx.outputs[0].message); - delete tx.outputs; - } else { - tx.amount = lodash.reduce(tx.outputs, function(total, o) { - formatAmount(o, o.amount * self.satToUnit); - return total + o.amount; - }, 0); - var summary = tx.outputs; - tx.outputs = [{ - amount: tx.amount, - message: tx.message, - summary: summary - }]; - tx.outputs[0].parent = tx.outputs; - tx.outputs.transform = formatAmount; - tx.outputs.accumulator = 'amount'; - tx.outputs.recipientCount = summary.length; - formatAmount(tx.outputs[0], tx.amount * self.satToUnit); - } + tx.amount = lodash.reduce(tx.outputs, function(total, o) { + formatAmount(o, o.amount * self.satToUnit); + return total + o.amount; + }, 0); + var summary = tx.outputs; + tx.outputs = [{ + amount: tx.amount, + message: tx.message, + summary: summary + }]; + tx.outputs[0].parent = tx.outputs; + tx.outputs.transform = formatAmount; + tx.outputs.accumulator = 'amount'; + tx.outputs.recipientCount = summary.length; + formatAmount(tx.outputs[0], tx.amount * self.satToUnit); } formatAmount(tx, tx.amount * self.satToUnit); From 8caffb8632997eef922a9b7650d944c6cc8149d9 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Fri, 17 Jul 2015 14:48:46 -0700 Subject: [PATCH 066/158] simplify html, improve localizability by using Recipients as label --- public/views/includes/output.html | 10 ++-------- public/views/includes/transaction.html | 18 +++++++----------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/public/views/includes/output.html b/public/views/includes/output.html index 82f324b62..30779518d 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,11 +1,9 @@
  • - To: - {{output.summary.length}} - recipients + Recipients: + {{output.summary.length}} - {{output.summary[0].toAddress}}
  • To: @@ -17,10 +15,6 @@ {{output.alternativeAmountStr}}
    • -
  • - Note: - {{output.summary[0].message}} -
  • Note: {{output.message}} diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index 2ad5ecab5..a5438e714 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -11,20 +11,16 @@
    • - To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - - + + Recipients: {{tx.outputs.recipientCount}} - recipients - - - - {{tx.outputs[0].summary[0].toAddress}} + To: + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + {{tx.toAddress}} From 4867e9983f264d0019992978b563e84899eb5db0 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Thu, 23 Jul 2015 15:06:56 -0700 Subject: [PATCH 067/158] simplify recipient summary logic so that entire list is expanded with one click --- public/views/includes/output.html | 14 ++++++++------ public/views/includes/transaction.html | 2 +- public/views/modals/txp-details.html | 2 +- src/js/controllers/index.js | 17 ++++++++--------- src/js/controllers/walletHome.js | 26 +++++++------------------- 5 files changed, 25 insertions(+), 36 deletions(-) diff --git a/public/views/includes/output.html b/public/views/includes/output.html index 30779518d..2e8355edb 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,21 +1,23 @@
    -
  • +
  • Recipients: - {{output.summary.length}} + {{output.parent.length}}
    • -
  • +
  • To: - {{output.toAddress}} + {{output.toAddress}} + +
    • -
  • +
  • Amount: {{output.amountStr}} {{output.alternativeAmountStr}}
    • -
  • +
  • Note: {{output.message}}
    • diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index a5438e714..849bd2140 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -13,7 +13,7 @@
    Recipients: - {{tx.outputs.recipientCount}} + {{tx.outputs.length}} To: diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index fbe0fcb57..5a1554944 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -15,7 +15,7 @@

    Details

    • diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 62b8b7294..7148ab005 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -436,21 +436,20 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; if (tx.outputs) { - tx.amount = lodash.reduce(tx.outputs, function(total, o) { + tx.outputs.details = JSON.parse(JSON.stringify(tx.outputs)); + tx.amount = lodash.reduce(tx.outputs.details, function(total, o) { + o.parent = tx.outputs; formatAmount(o, o.amount * self.satToUnit); return total + o.amount; }, 0); - var summary = tx.outputs; - tx.outputs = [{ + tx.outputs.summary = [{ amount: tx.amount, message: tx.message, - summary: summary + parent: tx.outputs }]; - tx.outputs[0].parent = tx.outputs; - tx.outputs.transform = formatAmount; - tx.outputs.accumulator = 'amount'; - tx.outputs.recipientCount = summary.length; - formatAmount(tx.outputs[0], tx.amount * self.satToUnit); + formatAmount(tx.outputs.summary[0], tx.amount * self.satToUnit); + tx.outputs.isSummarized = true; + tx.outputs.list = tx.outputs.summary; } formatAmount(tx, tx.amount * self.satToUnit); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 9d9c431e7..e3479c451 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -255,10 +255,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.loading = true; $scope.error = null; $timeout(function() { - lodash.times( - txp.outputs ? txp.outputs.recipientCount : 0, - function(n) { $scope.expand(txp.outputs); } - ); fc.signTxProposal(txp, function(err, txpsi) { profileService.lockFC(); self.setOngoingProcess(); @@ -368,21 +364,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.copyAddress(addr); }; - $scope.expand = function(list) { - if (list && list.length && list[list.length - 1].summary) { - var lastItem = list.pop(); - if (lastItem.summary.length === 0) return; - var nextItem = lastItem.summary.shift(); - lastItem[list.accumulator] -= nextItem[list.accumulator]; - list.push(nextItem); - if (lastItem.summary.length) { - if (lastItem.summary.length === 1) { - list.push(lastItem.summary.pop()); - } else { - list.transform(lastItem, lastItem[list.accumulator]); - list.push(lastItem); - } - } + $scope.toggleOutputSummary = function(output) { + if (output.parent.isSummarized) { + output.parent.isSummarized = false; + output.parent.list = output.parent.details; + } else { + output.parent.isSummarized = true; + output.parent.list = output.parent.summary; } }; From 43bca75728b21328e6dbacf9468ca307bb45e3c6 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 28 Jul 2015 10:22:46 -0700 Subject: [PATCH 068/158] txp and txhistory share outputs.html for all amount/address/message --- public/views/includes/output.html | 24 +++++------ public/views/modals/tx-details.html | 17 ++++---- public/views/modals/txp-details.html | 26 +++++------- src/js/controllers/index.js | 59 +++++++++++++++++----------- src/js/controllers/walletHome.js | 14 +++---- 5 files changed, 75 insertions(+), 65 deletions(-) diff --git a/public/views/includes/output.html b/public/views/includes/output.html index 2e8355edb..d217412b2 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,24 +1,24 @@
      -
    • +
    • Recipients: - {{output.parent.length}} - + {{output.recipientCount}} + +
      • -
    • +
    • To: - {{output.toAddress}} - - + {{output.toAddress || output.address}}
      • -
    • - Amount: +
    • + Total + Amount: {{output.amountStr}} - {{output.alternativeAmountStr}} + {{output.alternativeAmountStr}}
      • -
    • +
    • Note: - {{output.message}} + {{output.message}}
    diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 459d6601e..51df05a21 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -27,8 +27,17 @@

    Details

    +
      -
    • +
      +
      +
      +
      +
    • To: @@ -54,12 +63,6 @@ Fee: {{feeStr}}
      • -
    • - Note: - - {{btx.message}} - -
    • Merchant message: diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 5a1554944..783668dae 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -14,24 +14,18 @@

      Details

        -
        +
        +
        +
        +
        -
      • - To: - {{tx.toAddress}} -
        • -
      • - Amount: - {{amountStr}} - {{alternativeAmountStr}} - -
        • -
      • - Note: - {{tx.message}} -
      • Fee: {{feeStr}} diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 7148ab005..737cb0520 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -425,33 +425,43 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; + self.summarizeOutputs = function(tx, formatAmount) { + tx.showSingle = true; + if (tx.outputs) { + tx.showSingle = false; + tx.outputs.details = lodash.clone(tx.outputs); + tx.amount = lodash.reduce(tx.outputs.details, function(total, o) { + formatAmount(o); + return total + o.amount; + }, 0); + tx.outputs.summary = { + amount: tx.amount, + message: tx.message, + isSummary: true, + showDetails: false, + recipientCount: tx.outputs.details.length + }; + formatAmount(tx.outputs.summary); + if (tx.outputs.length === 1 && !tx.outputs[0].message) { + tx.showSingle = true; + tx.toAddress = tx.outputs[0].toAddress; // txproposal + tx.address = tx.outputs[0].address; // txhistory + } + } + }; + self.setPendingTxps = function(txps) { var config = configService.getSync().wallet.settings; self.pendingTxProposalsCountForUs = 0; lodash.each(txps, function(tx) { - function formatAmount(obj, amount) { - obj.amountStr = profileService.formatAmount(obj.amount) + ' ' + config.unitName; - obj.alternativeAmount = rateService.toFiat(obj.amount, config.alternativeIsoCode) ? rateService.toFiat(obj.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; - obj.alternativeAmountStr = obj.alternativeAmount + " " + config.alternativeIsoCode; + function formatAmount(tx) { + tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; + tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; + tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; }; - if (tx.outputs) { - tx.outputs.details = JSON.parse(JSON.stringify(tx.outputs)); - tx.amount = lodash.reduce(tx.outputs.details, function(total, o) { - o.parent = tx.outputs; - formatAmount(o, o.amount * self.satToUnit); - return total + o.amount; - }, 0); - tx.outputs.summary = [{ - amount: tx.amount, - message: tx.message, - parent: tx.outputs - }]; - formatAmount(tx.outputs.summary[0], tx.amount * self.satToUnit); - tx.outputs.isSummarized = true; - tx.outputs.list = tx.outputs.summary; - } - formatAmount(tx, tx.amount * self.satToUnit); + self.summarizeOutputs(tx, formatAmount); + formatAmount(tx); tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName; tx.alternativeIsoCode = config.alternativeIsoCode; @@ -494,10 +504,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r tx.time = now; tx.rateTs = Math.floor((tx.ts || now) / 1000); - tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')( if (tx.fees) tx.feeStr = profileService.formatAmount(tx.fees) + ' ' + config.unitName; + function formatAmount(tx) { + tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')( + }; + + self.summarizeOutputs(tx, formatAmount); + formatAmount(tx); if (c < self.limitHistory) { self.txHistory.push(tx); c++; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index e3479c451..c5f4868c5 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -364,14 +364,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.copyAddress(addr); }; - $scope.toggleOutputSummary = function(output) { - if (output.parent.isSummarized) { - output.parent.isSummarized = false; - output.parent.list = output.parent.details; - } else { - output.parent.isSummarized = true; - output.parent.list = output.parent.summary; - } + $scope.toggleOutputDetails = function(summary) { + summary.showDetails = !summary.showDetails; }; $scope.cancel = function() { @@ -1059,6 +1053,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; + + $scope.toggleOutputDetails = function(summary) { + summary.showDetails = !summary.showDetails; + }; }; var modalInstance = $modal.open({ From 578c4a8499e8081942a815738edb360d2ac0fb14 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Tue, 28 Jul 2015 10:50:33 -0700 Subject: [PATCH 069/158] use new showSingle flag in includes/transaction.html --- public/views/includes/transaction.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index 849bd2140..f7d9b9d92 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -11,11 +11,11 @@
      - + Recipients: {{tx.outputs.length}} - + To: {{tx.merchant.domain}} From 4ec25a1afe2189ddfe9c31d4a0ae9ef655209169 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Wed, 29 Jul 2015 20:12:37 +0900 Subject: [PATCH 070/158] Fixed angular translations --- src/js/controllers/copayers.js | 24 ++++++++++++++---------- src/js/controllers/preferencesDelete.js | 19 ++++++++++++------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js index 2e2b6296b..51a7e2845 100644 --- a/src/js/controllers/copayers.js +++ b/src/js/controllers/copayers.js @@ -4,6 +4,10 @@ angular.module('copayApp.controllers').controller('copayersController', function($scope, $rootScope, $timeout, $log, $modal, profileService, go, notification, isCordova, gettext, gettextCatalog) { var self = this; + var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?'); + var ok_msg = gettextCatalog.getString('OK'); + var cancel_msg = gettextCatalog.getString('Cancel'); + var confirm_msg = gettextCatalog.getString('Confirm'); self.init = function() { var fc = profileService.focusedClient; @@ -18,16 +22,16 @@ angular.module('copayApp.controllers').controller('copayersController', var _modalDeleteWallet = function() { var ModalInstanceCtrl = function($scope, $modalInstance, gettext) { - $scope.title = gettext('Are you sure you want to delete this wallet?'); + $scope.title = delete_msg; $scope.loading = false; $scope.ok = function() { $scope.loading = true; - $modalInstance.close('ok'); + $modalInstance.close(ok_msg); }; $scope.cancel = function() { - $modalInstance.dismiss('cancel'); + $modalInstance.dismiss(cancel_msg); }; }; @@ -59,7 +63,7 @@ angular.module('copayApp.controllers').controller('copayersController', } else { go.walletHome(); $timeout(function() { - notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); + notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); }); } }); @@ -70,13 +74,13 @@ angular.module('copayApp.controllers').controller('copayersController', var fc = profileService.focusedClient; if (isCordova) { navigator.notification.confirm( - 'Are you sure you want to delete this wallet?', + delete_msg, function(buttonIndex) { if (buttonIndex == 2) { _deleteWallet(); } }, - 'Confirm', ['Cancel', 'OK'] + confirm_msg, [cancel_msg, ok_msg] ); } else { _modalDeleteWallet(); @@ -86,7 +90,7 @@ angular.module('copayApp.controllers').controller('copayersController', self.copySecret = function(secret) { if (isCordova) { window.cordova.plugins.clipboard.copy(secret); - window.plugins.toast.showShortCenter('Copied to clipboard'); + window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard')); } }; @@ -95,9 +99,9 @@ angular.module('copayApp.controllers').controller('copayersController', if (isMobile.Android() || isMobile.Windows()) { window.ignoreMobilePause = true; } - var message = 'Join my Copay wallet. Here is the invitation code: ' + secret + ' You can download Copay for your phone or desktop at https://copay.io'; - window.plugins.socialsharing.share(message, 'Invitation to share a Copay Wallet', null, null); + var message = gettextCatalog.getString('Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io', {secret: secret}); + window.plugins.socialsharing.share(message, gettextCatalog.getString('Invitation to share a Copay Wallet'), null, null); } }; - }); + }); \ No newline at end of file diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 67176147a..9cdb905e5 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -5,18 +5,23 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro this.isCordova = isCordova; this.error = null; + var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?'); + var ok_msg = gettextCatalog.getString('OK'); + var cancel_msg = gettextCatalog.getString('Cancel'); + var confirm_msg = gettextCatalog.getString('Confirm'); + var _modalDeleteWallet = function() { var ModalInstanceCtrl = function($scope, $modalInstance, gettext) { - $scope.title = gettext('Are you sure you want to delete this wallet?'); + $scope.title = delete_msg; $scope.loading = false; $scope.ok = function() { $scope.loading = true; - $modalInstance.close('ok'); + $modalInstance.close(ok_msg); }; $scope.cancel = function() { - $modalInstance.dismiss('cancel'); + $modalInstance.dismiss(cancel_msg); }; }; @@ -42,7 +47,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro if (err) { self.error = err.message || err; } else { - notification.success(gettext('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); + notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {walletName: walletName})); } }); }; @@ -50,16 +55,16 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro this.deleteWallet = function() { if (isCordova) { navigator.notification.confirm( - 'Are you sure you want to delete this wallet?', + delete_msg, function(buttonIndex) { if (buttonIndex == 2) { _deleteWallet(); } }, - 'Confirm', ['Cancel', 'OK'] + confirm_msg, [cancel_msg, ok_msg] ); } else { _modalDeleteWallet(); } }; - }); + }); \ No newline at end of file From 53d96e3afab62ea6ba8d90d8d179fce848025269 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Wed, 29 Jul 2015 20:17:35 +0900 Subject: [PATCH 071/158] Updated templates.pot --- i18n/po/template.pot | 65 ++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 62e4b15c1..ac84f9383 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -46,6 +46,10 @@ msgstr "" msgid "Advanced" msgstr "" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "" + #: public/views/disclaimer.html msgid "Agree" msgstr "" @@ -87,6 +91,11 @@ msgstr "" msgid "Available Balance" msgstr "" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -131,7 +140,7 @@ msgid "Bitcoin address" msgstr "" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." msgstr "" #: public/views/modals/txp-details.html @@ -160,6 +169,8 @@ msgstr "" #: public/views/copayers.html #: public/views/walletHome.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js msgid "Cancel" msgstr "" @@ -184,6 +195,7 @@ msgid "Choose a wallet to send funds" msgstr "" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -200,6 +212,11 @@ msgstr "" msgid "Commit hash" msgstr "" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Confirm" +msgstr "" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "" @@ -208,6 +225,10 @@ msgstr "" msgid "Copayers" msgstr "" +#: src/js/controllers/copayers.js +msgid "Copied to clipboard" +msgstr "" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "" @@ -321,6 +342,11 @@ msgstr "" msgid "Creating transaction" msgstr "" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "" + #: public/views/modals/tx-details.html msgid "Date" msgstr "" @@ -372,18 +398,10 @@ msgstr "" msgid "ENTER" msgstr "" -#: src/js/controllers/preferencesFee.js -msgid "Economy" -msgstr "" - #: public/views/preferences.html msgid "Email Notifications" msgstr "" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "" @@ -434,6 +452,10 @@ msgstr "" msgid "Fee" msgstr "" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -543,6 +565,10 @@ msgstr "" msgid "Invalid" msgstr "" +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "" + #: src/js/controllers/index.js msgid "Italian" msgstr "" @@ -560,6 +586,10 @@ msgstr "" msgid "Join" msgstr "" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "" + #: public/views/add.html msgid "Join shared wallet" msgstr "" @@ -640,10 +670,6 @@ msgstr "" msgid "No transactions yet" msgstr "" -#: src/js/controllers/preferencesFee.js -msgid "Normal" -msgstr "" - #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" @@ -655,6 +681,11 @@ msgstr "" msgid "Note" msgstr "" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "OK" +msgstr "" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "" @@ -783,10 +814,6 @@ msgstr "" msgid "Preferences" msgstr "" -#: src/js/controllers/preferencesFee.js -msgid "Priority" -msgstr "" - #: public/views/modals/customized-amount.html msgid "QR Code" msgstr "" @@ -1209,10 +1236,6 @@ msgstr "" msgid "too long!" msgstr "" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "" From d394ecf64706e9bc395e9d274b731b4cf178d17d Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 30 Jul 2015 00:34:01 +0900 Subject: [PATCH 072/158] Update template --- i18n/po/template.pot | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index ac84f9383..2750d2fb1 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -68,8 +68,8 @@ msgstr "" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "" @@ -676,8 +676,7 @@ msgid "Not valid" msgstr "" #: public/views/walletHome.html -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html +#: public/views/includes/output.html msgid "Note" msgstr "" @@ -830,6 +829,11 @@ msgstr "" msgid "Received" msgstr "" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "" @@ -1073,12 +1077,17 @@ msgid "Time" msgstr "" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "" +#: public/views/includes/output.html +msgid "Total" +msgstr "" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "" From f69e980d71a6c6d46f07935bee5f52da12974040 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Jul 2015 12:37:51 -0300 Subject: [PATCH 073/158] Fix alert messages --- public/views/modals/confirmation.html | 12 ++++++------ src/js/controllers/copayers.js | 10 +++++----- src/js/controllers/preferencesDelete.js | 10 +++++----- src/js/controllers/walletHome.js | 9 +++++++-- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/public/views/modals/confirmation.html b/public/views/modals/confirmation.html index 1d56e2348..7bf89e5b6 100644 --- a/public/views/modals/confirmation.html +++ b/public/views/modals/confirmation.html @@ -1,16 +1,16 @@

      {{title|translate}}

      -
      - -
      +
      + +
      diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js index 51a7e2845..a06ee1845 100644 --- a/src/js/controllers/copayers.js +++ b/src/js/controllers/copayers.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('copayersController', var self = this; var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?'); - var ok_msg = gettextCatalog.getString('OK'); + var accept_msg = gettextCatalog.getString('Accept'); var cancel_msg = gettextCatalog.getString('Cancel'); var confirm_msg = gettextCatalog.getString('Confirm'); @@ -27,7 +27,7 @@ angular.module('copayApp.controllers').controller('copayersController', $scope.ok = function() { $scope.loading = true; - $modalInstance.close(ok_msg); + $modalInstance.close(accept_msg); }; $scope.cancel = function() { @@ -76,11 +76,11 @@ angular.module('copayApp.controllers').controller('copayersController', navigator.notification.confirm( delete_msg, function(buttonIndex) { - if (buttonIndex == 2) { + if (buttonIndex == 1) { _deleteWallet(); } }, - confirm_msg, [cancel_msg, ok_msg] + confirm_msg, [accept_msg, cancel_msg] ); } else { _modalDeleteWallet(); @@ -104,4 +104,4 @@ angular.module('copayApp.controllers').controller('copayersController', } }; - }); \ No newline at end of file + }); diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 9cdb905e5..99c6e3f01 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro this.error = null; var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?'); - var ok_msg = gettextCatalog.getString('OK'); + var accept_msg = gettextCatalog.getString('Accept'); var cancel_msg = gettextCatalog.getString('Cancel'); var confirm_msg = gettextCatalog.getString('Confirm'); @@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro $scope.ok = function() { $scope.loading = true; - $modalInstance.close(ok_msg); + $modalInstance.close(accept_msg); }; $scope.cancel = function() { @@ -57,14 +57,14 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro navigator.notification.confirm( delete_msg, function(buttonIndex) { - if (buttonIndex == 2) { + if (buttonIndex == 1) { _deleteWallet(); } }, - confirm_msg, [cancel_msg, ok_msg] + confirm_msg, [accept_msg, cancel_msg] ); } else { _modalDeleteWallet(); } }; - }); \ No newline at end of file + }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c4d19c977..fed86da03 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -89,6 +89,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $rootScope.$digest(); }); + var accept_msg = gettextCatalog.getString('Accept'); + var cancel_msg = gettextCatalog.getString('Cancel'); + var confirm_msg = gettextCatalog.getString('Confirm'); + // walletHome @@ -1072,7 +1076,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; this.confirmDialog = function(msg, cb) { - if (isCordova) { + if (isCordova) { navigator.notification.confirm( msg, function(buttonIndex) { @@ -1083,7 +1087,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } else { return cb(false); } - } + }, + confirm_msg, [accept_msg, cancel_msg] ); } else if (isChromeApp) { // No feedback, alert/confirm not supported. From e5e1e34fde9e4491c49590bce9c9a63366db6986 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Jul 2015 12:42:05 -0300 Subject: [PATCH 074/158] Translated toast cordova plugin --- src/js/controllers/backup.js | 6 +++--- src/js/controllers/walletHome.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 93234d824..ea9325a64 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('backupController', - function($rootScope, $scope, $timeout, backupService, profileService, isMobile, isCordova, notification, go, gettext) { + function($rootScope, $scope, $timeout, backupService, profileService, isMobile, isCordova, notification, go, gettext, gettextCatalog) { this.isSafari = isMobile.Safari(); this.isCordova = isCordova; this.error = null; @@ -54,7 +54,7 @@ angular.module('copayApp.controllers').controller('backupController', var ew = this.getBackup(); if (!ew) return; window.cordova.plugins.clipboard.copy(ew); - window.plugins.toast.showShortCenter('Copied to clipboard'); + window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard')); $rootScope.$emit('Local/BackupDone'); }; @@ -63,7 +63,7 @@ angular.module('copayApp.controllers').controller('backupController', if (isMobile.Android() || isMobile.Windows()) { window.ignoreMobilePause = true; } - window.plugins.toast.showShortCenter('Preparing backup...'); + window.plugins.toast.showShortCenter(gettextCatalog.getString('Preparing backup...')); var name = (fc.credentials.walletName || fc.credentials.walletId); if (fc.alias) { name = fc.alias + ' [' + name + ']'; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index fed86da03..4b8935b70 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -431,7 +431,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.copyAddress = function(addr) { if (isCordova) { window.cordova.plugins.clipboard.copy(addr); - window.plugins.toast.showShortCenter('Copied to clipboard'); + window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard')); } else if (nodeWebkit.isDefined()) { nodeWebkit.writeToClipboard(addr); } From aa3870a83195c9cce1a88139bc8a52cabb1b2693 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Jul 2015 13:07:35 -0300 Subject: [PATCH 075/158] Updates fee levels strings for translate --- public/views/preferences.html | 2 +- public/views/preferencesFee.html | 2 +- src/js/services/feeService.js | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index c8753e221..6f3c7db24 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -81,7 +81,7 @@ Bitcoin Network Fee Policy - {{index.currentFeeLevel}} + {{index.currentFeeLevel|translate}}
    • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index b0c740745..a1c2c4c84 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -7,7 +7,7 @@
      • - {{fee.level}} + {{fee.level|translate}}
      diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index d37df45a7..c76c76223 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -1,8 +1,15 @@ 'use strict'; -angular.module('copayApp.services').factory('feeService', function($log, profileService, configService) { +angular.module('copayApp.services').factory('feeService', function($log, profileService, configService, gettextCatalog) { var root = {}; + // Constant fee options to translate + var feeOpts = [ + gettextCatalog.getString('priority'), + gettextCatalog.getString('normal'), + gettextCatalog.getString('economy') + ]; + root.getCurrentFeeValue = function(cb) { var fc = profileService.focusedClient; var config = configService.getSync().wallet.settings; From 7c69e867717c1c4c97d579d4fd28c39bc6b6b5b9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Jul 2015 13:08:33 -0300 Subject: [PATCH 076/158] Updates template.pot --- i18n/po/template.pot | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 2750d2fb1..571f32eea 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -29,6 +29,9 @@ msgid "About Copay" msgstr "" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "" @@ -169,8 +172,10 @@ msgstr "" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "" @@ -214,6 +219,7 @@ msgstr "" #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Confirm" msgstr "" @@ -225,7 +231,9 @@ msgstr "" msgid "Copayers" msgstr "" +#: src/js/controllers/backup.js #: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js msgid "Copied to clipboard" msgstr "" @@ -658,10 +666,6 @@ msgstr "" msgid "New Payment Proposal" msgstr "" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "" - #: public/views/walletHome.html msgid "No Private key" msgstr "" @@ -680,11 +684,6 @@ msgstr "" msgid "Note" msgstr "" -#: src/js/controllers/copayers.js -#: src/js/controllers/preferencesDelete.js -msgid "OK" -msgstr "" - #: public/views/modals/tx-status.html msgid "OKAY" msgstr "" @@ -813,6 +812,10 @@ msgstr "" msgid "Preferences" msgstr "" +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "" + #: public/views/modals/customized-amount.html msgid "QR Code" msgstr "" @@ -1219,6 +1222,10 @@ msgstr "" msgid "Your wallet has been imported correctly" msgstr "" +#: src/js/services/feeService.js +msgid "economy" +msgstr "" + #: public/views/preferencesEmail.html msgid "email for wallet notifications" msgstr "" @@ -1227,6 +1234,10 @@ msgstr "" msgid "locked by pending payments" msgstr "" +#: src/js/services/feeService.js +msgid "normal" +msgstr "" + #: public/views/copayers.html #: public/views/walletHome.html #: public/views/includes/sidebar.html @@ -1237,6 +1248,10 @@ msgstr "" msgid "optional" msgstr "" +#: src/js/services/feeService.js +msgid "priority" +msgstr "" + #: public/views/preferences.html msgid "settings" msgstr "" From 4ef6008f812628f967ef7a0d4404a0385aebab1c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 29 Jul 2015 18:15:37 -0300 Subject: [PATCH 077/158] Credist for crowdin translators --- public/img/copay_crowdin.png | Bin 0 -> 16225 bytes public/views/preferencesAbout.html | 4 ++++ public/views/translators.html | 34 +++++++++++++++++++++++++++++ src/js/routes.js | 11 ++++++++++ 4 files changed, 49 insertions(+) create mode 100644 public/img/copay_crowdin.png create mode 100644 public/views/translators.html diff --git a/public/img/copay_crowdin.png b/public/img/copay_crowdin.png new file mode 100644 index 0000000000000000000000000000000000000000..31695e9981b70b35fb45fb7f819507f5d5bbb15c GIT binary patch literal 16225 zcmXAw1yo#1vxP|@1PSi$1POz?1$P@BtZ7|{vkcXZ0hur;rKL$A#HZhu7o z7APU9L@cX6>nJ3DS$SD`$472g?p;zOP{ovXl>HYCO}q`m2O->rg=VRltorpDOq$<9 zb3?%(i2^k=tV#-My7-+Qu3U<4G?-sdAK^%Uj`JADTyNMm5Cly2Obl?zRS>P59^}~R zr(T9x6yA6ey7H1j-E*yqWH>?+2mUg#u*R2sqcs*0gFh?@8!)N<7y1eHJ5;tNT+Fa= zW*THy-iRKjay37vDGJi$F@lYFpDmXYi-wObY^*_(L)Ix-0A8_8ogQaq;tL+M7AjBy zC#LjnLboi`_)rK*i|Nn&?~+1-c=*fqO?5F;Q!E>G*SpHserh{=Eoeg}frVt9DSJP0 zV;Y;qCZbB{$WkiBZPM&I>ezDTZ6~PA&t2bDP2V6z+t;*1Cc|h?TzNz8tR?VBXMxwc zu@6zSapjF-AR^@T$%u5$8DmIOfa-b<&2Ef0vu^$S-w!sPq0mz^Ms@`|GT6ZMPS`*y*MQV z_=X1&)tT`}W$KUp1Gq1Gu#rz!<@MBfz$G_v(IkZBWYjDxGR3axnU!n4vZjdmb#zRg zA7D`bjepKrvUaVUo4d?wh?$&Nsp_G_f{~OC-3=1);{NMJuY_hmLVG)S=xk88oa}8{ zt?_s9^n>s#BZ3m9L$gk(En3KQ*rH+Yp))#KrFPOj`gbTnx4 zJGm^_(=)?{Tolp$>{e~I-1kooVdGk&7`rTrf+TCVNFruhkgeW$nV;pg59dd|x7-KE zM+tRIQ`6fFF1MtT!=~PdBq=HBP_YUGgvb@6zl7??Vn8I1p6Oe923HMQSi61}Yk~yA zSiO3&y7KP-S=m_KR&~C;F{)px;yr29A?M{#RZL9?6GrmaZ-S<=XZ=t zu`R_PyePdD`y&!1Oyzn#~FfaQTMY)BPfym6ZbErXBZ|%g{G19>LdXzWDPMS1OtH$<^6hoM z2M%4I0GWC*vEUlNdF*(M?T^st|MnvkbwQkFjI$SQBqWz)%0fS2w(Y|OH z^RV%Z@seb02Gpc5r;W&rRn?b=zGOuHD}E%a@Cb-I)Z~{>K@5@=Hx|X!ids51b}4C2 zMx3`iJUHvtXCn(I|Lkg)$HZvWJ9u*wWVt4&DW+}4crA{R3kNBYI$3M}H30W6%E!Un z+tNS&7+XU6-9rgvB@+=VN%>3Y%f_`xaW0KxSq_Ax`ji*?o=MZ2nigIZ64o$jsvSq@cYi zYOT|tu+Y?@F#||bL!-QbVOcX9O)_r0k^y6uFX9*y(b>BpcEm=OrgLRJX8DxWEO5GA2@RlOsh^7Wo{8+f5Ci!heL#N_*<}?LfC#8qo9bGl+bUbA%6Or z!enLDd2`EiV^{f@=|ipRnCiTc^alJU@3v(1Ebf6hB&^o!PCVa-yU((6;~)Vj7TR=9 zm2&gPb=$__W4pGFK-o_p=%f)BI-IVn`LTftiNs)o8%dpQ72{-{BfgD+>g#_tdOo1v$pyaj+SsC6nqu4^|IobIx$pgM%L~@n3MCjosa7Q@;F0pMCoA>(K>fpx7XrYS}i`* zl1;MG4!#`Bahow_Uvyw)>rMAY8&cWzO#AGKL#$wh{&_K=!%I?Sy`Rc|C=&U%iEYmf za{_{vFZz&Dh7ngL34>Mw10w`uEP5y%2FD-)lKW2AgGwA9qJiMt=VFV0~H(`&5olnI<0)lvc!*wuyFn3VCk%-mdve} zlkr-U(riv9X7=uxk#7mgtP4c)9DnG)a`5O$lGsylNMLQqt43Z)fJ%A7c%LTzO1-AL->C11PoyJX_4jlWW?`Q-A+f5YX;6 zuP}4pdzL+lF{--d)35TBRH23rkkS|bqwlHKH4e*g#7}GA%yS={*rme%nV4c)aqPsVSn~)O_t2e zX=SIfUuE;h=BFnHhMou?ewk&j1PFt+T}2QD-LG*u&)5v>HO@JW@G}2i&V4Qliw@s_ zK(`R5%?L2@4WX=g$FSm9c@MBr(PsVe-n6*0T|by65h_uPMa2nN)4$>Y)G_C7;e3ic%maq2TGQ$axf%vM{{w1_)25Ew71i_k)s z^_$NQ!{TzWMzE!;i7Zu7z3OfB*UWcX1bstzqufY@A10uvUY15iLj!G~6EJD$6&dAY<<&ul852WB{6|fVtou55Y9l=I z5KGunQEdpxj@*T3CIih4m4+x3hqgoE|B&)=G5pidW`23NY2fyGrQvA7Dv=#x6nqYW zgY$k5@cZ3-Na(r!jk+vu-Tm_2qZPY!)^fY6F5TJn{<$5M1#g){wKBElp{8eGfzpg| z-u@2EuFDUdI)a_;vv&gvE78}aG(T_}jNSgwrEI;d(RAcAGIH4DdX21H^F)=sZ(JCU ziZiNxp1mb6LSJUFYE!R)i%VRPoB!|pZZ6t3I*V@~L-u1a&EWpv*LsGs&hXrU(Prvq z&(GfV7IpYTb32UME*$LqGSjQbD<}ucWSyNViI}-6-_{f6b{!`trp7J?QqN&Z5vl1J z9x;abT_V(i3*WHHe9ZCaKgsLB7nP{WfMv1$9?RCLKrD%qi+-DD6H4WG9|%Dd;4tW* zE~)jOk-TmJc$tdm1;fU=n;+&dQ!sMF#46y#G4jc1BoCA5VT6KJ&=1C+HM<{9;QIfx zjXsPpL0KWzgOh9G-l{8Yi01(gU(NKfsl zbZmBVRl!K6AFQiXl3&i1J(LALuc zsk8MdzBhsbYZH4y*0ve6>zVlZ<#ct4hOj(2xpX~Yi#l4IsWP8+Ui&!M-O@w`q=$9{ z-)|_@ybz;&#`8GWg)#YmfCqByG{!E69Y#hD+#Qc2Ue<=!NvT(y?1(Dy2*;END;>Uz zV%ADhP7W0OLijUIS2>e?8DByzIo#}T6KL-IMegQuz2l{0P>z9GGDjR!jM9JS^1qXm zPRFXGdiMD+CEQ0V8N|Uc$yeD`zL4p`q~nIiP3`{1Y5V!Fs=Tr|Lt~>!Co9#_`41Z3 zH*6(1?Fjj$M4SkaMr|@$90MX}@N-C}=nF_%0%baS}Rn^8~^p``o z+B2LDPk0goqtX;~U4BdP-J8EF%5YwxKTrvw4vY^{%HlL{^~||91VmQ~WZR$%2|I#6 zq8Xqtjun@bbnZGb^YY4ATc1=vkK!|WG&mVn_ie>feE}bj|#>Gxx+N2~xO^W_IoU3pa42uO`qz@GT(T@Bb1rOzk%;2hkXBSe>m24x)QpRb2+ebu*!UqlXIzdf%^m~Nk1acW2t_j@Tt>YX8!txG!b6<~E zNAMZR!?Tz#TBC^_RR?m~6b5g~{eSperi9K|l-Mo@&oZB6s)(Y=>mZw%*2j0ej&|g8 z(WeHt|6yKqfo*_m>lTWP#EHdi3JDxw$nV99i%X3Zu5u*3?s&asWMXMDkEPj>X5@bI z2}Y~p#cu07+4<=Eyes&X(*((%^r8*rJ&R)B@2@+_t`G`;-;#gD%MzlWtfMS!k>%R% z^7$Ks$X9g=ie92I5f= z6KNAkD*DgMHql~#7&VB7fbCHi+0Mg+HfOB{q_x!YLQKiXo9Ul1GM?zNG_y45_jbdN z0ts*TT*b*+?9bs}R^;o~ivP-p3A7R@C1RQwN(tEj8>+r2MQsYbGvrs9iW6hMHn(075 zDB?SLE=`fm1%s#qe$z^n@E)}!tz#J#jBaSOjmc-cbT8mto29LtkpZQ9hTmYtIwC7 zgdA%vFBEHB*SazJY!h8UykDgh26{JZ8Of%vR^(m==iks84%+`ri2pNWy+jdwRkmGg z`|@uzd01zVXL#6as@PWGoNBuGug2S+dV7d`%gfb?d`duNj@sMB55GYx3$<0AzP_zY z(ZD|Yyj^s3A%AUW3>-*L&2q=VJr{|d&$Q7c8G1SLuFPlO-gDn~*Bd+Rbxj+tj@O}V zBPR`y*PV`wgz5E8hGzKL;LDZhKY#tYo%CcDNfNI}eJ}rHUCEmpkj0&>U+^V38R;}S zb;%S;F2;5YknnVQ)kCJ2jtHNm4xE#Cepd>*Fmm_bwe17IJC=mJa z5r?f6EZY?eLuysTBY;HxIH&Gj6LJ)v{+LIvOdhDiBP zTuySJ8&&j3EFY2}kb}sR0}o)%Zd$`cKcaV1)JaoKtmPS)_0sPY?txd6e~E5=$INje z#cjHX09O0`DelkyNz{F7vZ01OrGkwIPN=j|62-;^)g4yEn)^ z)m*8tyK8?+Yvl{{8-<63Rcl}={8T(L@tk4INg8pHFJxsl-^Sw-L6p!>_#h3#(mj=5>Y+VPJ72{Ni8)3+kRUYEuS z!AXEs>JG?SprvY5^uc(B7NvrV&CVQr)7ADyU){ffecK+r_t;;s$Tq3yFDk5Bv>rw; zoj%O1%lll@%jxtTlu%>#EbeNpw?F@Jnm|@|{0ZGSR!3ZR1{|N3kyTLN{waNQUUz(S z?6+|cc5p5Y*rz5sIGJO|5zqA*`Vj1h_qccn^XV~0cHP1{udsg2%pV;l#=BZ4EeUv% zJy&SXqx9ri)@kKU&OjXwrV$4xHxbjhD+NqN3SyL?)Pdbo@0 z(DD|*a9n8J3scQ3Dm?rMZ4}WaclO#&W#?-p!MTm0>>Gd^cIl8$-FvMmWF>)ep2>I4 z$smoDZ#aI3WL)?tFmk%umLcFbdwwq~p74YJ+Bf(3jNpcMGym(?tD84nUyM0j5RQ>i zf-gf~s6A2Gy=r<`uB5Iq{iqx7OKg4OR_nJdqr8;1zRN+2G2NzU;Sy5G662F!mx;s1 zfROfJW6r_}GkZXFLN<|!%r7^lybr4d#|+wI!Bn>sN$cOPd!VZl8z zQNXBPMLknq#!D@_me(=2y4Q%89kQ(_n#)A@bu!~zX1-nRwAH6S^b69S-pIE^oW(Y6 zTdQ_5gBXd!Aif9|cHzokYjAsX zxd#Rli-%I?Gucu4iJj(KJ56P^k5XSh(trj`pZBCY@|jt9Ht#t-KTe%OgjjR)hq$4o4=31?3~BxiX|#s zr}EiX3lpdew1bxd;DO8S{;Ef*@o96m##LKSFE5|mm-`|mm#DW7sDp16)EtRTkjxZj zR{A18%Fsc)PjLp!h%iOsq$!mGSm^Kr`Q#39TE<{nTcsG?a%$QA9^>RLi34JGra3v0 zeIy;k9mPZ?d0XjAI*MNO-0ozpt!-9{l~%9W=c&SeGp`CdzgWq9N-;*uHno-@#0CW> zyDN7w=FQ6!8o|G%$4&10Fd`T}Yd>e6x=zhi$#g8Zx({Z4tNTAJ<*Z*lR(4zLORrj( zB2BNEy%0}6!&a20W)NL_x_iy@2OPLM?R25E-8%rmfiOL+X0XfKWPi-1*5b11j*zu} zshR=$%6X=D)x5`25}An=f(rACB098we zL@Nb9tmn7B0rz!WPb_a%Q7uElM<#t-z`!8KH$Y!`x&|0VeX5xiH+IKOK+#BZgnX%( zdk^$1YY#Fi0_j&RXljE8CLVCRDP&}HDJZ%mbglgZ^3MUaF)YS$)0)r z_CAxGqJHbsGA*up`gv`ik(%!pgH_gVrwh(KTD)af$%9etCj#KD}Ia`Y{&ns{QUOL|1 ztBjytV#FLVHD^Jnj7w2#La;1d9*ZBM6f?@W$b7nK)2!<(y+nSmnQ~UkWIDp0NlZ>0 zJgm6*D>0=;85u2^?P7aMHuWBocqvHN%p77R7a3FF7}Q?EJQ*j@e3XlYb;5}bh@ztv znKLVv7ZCeeEhMjcyQ_Qy2CGG6CN8!k3FSyLIp6yGcKk?ckX{)u_U`+0f{s-};fzN= zY0l#GazeG#?72{1_HBA(IaclZ`-_9Mnqqr?uwfZY%5kWx_-~Pt}P^!e& zMW5vR$GoIlyCUM)lJpy2y3=a8zyW<#^U=BXsc9wW4}I4))<=mW!{U);f7vJdfCF1Q zeg=NGR#D|tC2_DU&#c@&F7A&EruN2n^%t$MhUGH6bmA*tzx80VxJN0WQrq&}ia(Rj z?^e(4K{|ySqoracIW#r?;jMCIb8JO>eXVEDXG29m9xBhT_ZqW%3a)EjQnHj})Nrm{ z$2W;%jYMAsl<_Ex+w(SP{qcBT*Q+PVbY)g#)OHT)hg@8fuh)ROT*$n!?VI*E_CY`H z%Z!Fhz(Wz&Qjyy2&}!nA=-iOQNCnU-6&)NZ5#C-yzN4dOGB8?wjW?7xMbMs0VX(?< z)&T*vGZn)5fNE?ag?4zaNiD1jB{k3;nlf`bF|$x|Wh2w+A9DkdT@KC__tsS)+YH^1*>5 zFrf%odm|&M&>%}m$V$7=NPa_}wl!Vzb{f>+Sw+otAx{YZ66s}}gS+Zt=RkI`Jg{i`sd2i`;UtTJ~ojhx+E9`4p7I(JEVMpod;Wjs_t-9V{zrjI|MTczb zjTWE@+~;R-%&6s!2#3vzZOfj|S#>MHOw#VECdom94xUY05MzsfzmnC*y_p2>$n$p$tlXL5m zBI*@i-DxBTWOPNO=9WSfoRR4pmMcAW1N2>JmZk5>QfR&5UA!If_gOyRRj36WvHqPp zm>9tQS_)#$%f4>W%~PvsHyjP0$FD@(y=XtZxkCa~4V+slVI@|6G4xF_O_ z0Lh5LDxh}_KRP4X>dO?*PJ37=mgJ~lxJ7^H*1d7B`y&DHL9SDU!oG;q0-k} z$g$@A&c^!Wk+sy2aB`z!%US=eY`=LmD}XB#bd;v;@p_5^D9O8Z`^aFWjPbf-7vFN~ z&k2aL2DvmW-2B4|F9v4{BpBC{-B#A|WB~=DkZ=&8; zr=&*UtCTn}9piW_*h6y(SZCy@9i-@*2 z>aovUJ9^Gv%aYA?iH{N6hx&3;UiC!8)~FF!hnv7|uwkSI=D9K59qNyg9TXZEL+9;J zIM$4-<4M6aBV!64bwhUix!$Pd$R;+OYCv-L?EN*Yf;^_rzyIv;@Nwx!gZU6fN=8AJ z;(s$0wB86AzBOy5vgo)`SNQXw`?LN{JnQxKmOiWh`q`JHNw#z61a~edw1X7xi~J2p zs?l$OeVunLqQ&=v5UTrr7fLIBEw!YK$(ku93zeBIVXq-81>8qzG1TQ@l!uD7E9P?3 z{{IeLZSN!t4<8-kq-5?c(T@&#Fux_Z6P7FGfa&}SjgRcPn%pard839oiKJwtNLg)m z$COwgiKhhgkc_lV!8P}os!wt%Ig0up(7bfR;>pZhouXE12!MKw^jgYiwfIl(?o4D65w3M$Z-m;B%I1;rQys>s z=`6JS@FpZAh>D8x1@eW%gL@2|B0aMaixA00$UsBl=lUd3x(%8Ms#1De9S&ty`@*D1 zb317Vc&(!yM31a`YtL4c{l-;P9odtRh)CI0eYc>rnT58%V)f{k(nS2X8>{!8Ntr*& z^S;nU$CJ{0pM*%csWY!KqHdyHJ=xk?8Mt(j>8=~TRsB?hE)gB-jAD$(%n`dXmJ-p;j+_U~J+GEbFnAS!tgbJq?Qtfs+T?QxK z1Z*7Sv^+?<_Av4(3A$Jc==q9|UuPhTO}iwxbxX@1-pqnpPFDe5>O+FbBU}1Oq)K*% zykG3F$;omPq>S?@H8l-Ta`<26*1coy&IGm$`KWTE7;M-YTmzsGnykZy>Cq^6_Kjn+ z;%iSl3itOKU9Y1R5PJd}&F{`vq$U4iD`A#YSnU-_DCABSyWjn@9sAKHWp=(1e;fVX z*xDOEZxT4>1axoir~%_)&*%Tf!x-hN*T4zQIG>sf?jwE_eo3~bo4$Eu$MfCs02aFV z*TRY8s2(witEo+&e2|Kem_#61lC-yR($W+46Kt@3qt3|TZKKX#ALUO!+&u;3HVxQn zYoAB!qGBQ_d9Eg(vei^oE28;e*rnn+90geH5Dvdh4DLBUuhTy- zzHdrre@G>Z2bN{U)`lMc>It)_F$`<@N;i$z{oR}Hx;Y_~P{_<{EAw0QNtFInB6SH< zF%?gYPh_TVJagQ4EL?Yk68X(SvsiIJNr+qjth2yP!mko|Yb@apw(a7V`_z zPG0lz&!vh33k^<)RtS7z=$ZVlt+#Kq!4l$+TZkc=KlEe)F`mRu2s5YVPj-VKmz z0x%!cX>?7Lb_ z3dqrerN2g|4e=Zsd6(ErF@&~!>_G(mcRL-qwI)15>7PB>7 zsvdTi9UTF?G{L_5Jm&k8{%!Y0`s`*WRHDKJP*&;ZnYo4azpmIn0U3i=p%n$9T(BF8 zUbNnoIQI^fF6l9>0dONU7@E=X-Gc7tWM>D2Im^(f=$jVr(buc~PJUkZ$HjnR)rd+N zAzN6hE2kzEr(wH&q98yc8%=6`>LNqH@kB_K#n$5W^5Ma!#bl|TR!%u>d6N20rSO&F z%x{Y0hF;@@Uk_ZzYhbjHGG8uFR{w&=%=FVn*_AzlnBLH+}wvrS1x7|JV+)1j+}-^nF4 zfMd{GruIa!DljfCN8~A0s}LrSyEwa~D>O@4cnwaLXSAibJWgf)PEFcma&eHgzV|v zXEkTfMZYF5rF^f>96X;sw=tGx3v?0ds*wGdJ<5?!iLl~4wm7}XPZAXmt}zh_;^bu4 zDASBDvTWczI3&5ERh>0gm85!;%B?BNR^G2kHkSaHb%bB>Km7B$gCBgtyoxF-ZUn3YHs zJ)bw!mIfOQ4t)(hoqzLs9?1LFC=XbJ$ zpa#qjR4f*7(jH77r-HC#py4(!$Y<Ll7`X}MK4`2L@3%Y{qQ_wVkBOR zxcl`}4!~QB?oaidz2kZ1+}gOy{WqFW2u?hNhX-vk`16Kn^zGq4wJ8Rja|?0kulzvzU> zwEE>D)ObvSl|RuQo}3lcw?nEfEeJuMOTsPzYMDeqplUWm_B^MSD`x%W$x5gF%wdrV z41YN}iHT*b42~560MgPvVd|v#4Ac-@l4p%Rc}y|Sr;r08Lf@Z}IW&w3H#;HiD(a=__HOy_%p*E5;K=$B1 zOqERzGEtkM*UCq!;UIyHm<{$_`>8@s#>V!Lb8NNxEH7sR-S>QBcws)NJ*SF#hexZ4 zO!`w{UN|a>jE;OI-K;TCLk9#L!LDA&x{WAi!bz1@@Z`pa79e=C)_@BIS-IV5#1 z{lQ}q51>FnJC>j>eKv>PKAZojJK9e!T$wjFD3<}8F%EZENcmuR?fK;EBPRvW^0!Cg zat>ZMUe9DUytu*qla(?o zZuL`G`W;8i=Kk{rLiQI`K3&Se-1#C`UQZ=PY2l>b6>Hs(>6%R{>73Vn<7tgQmO;P72G;Dt(v}Q$M z+Z!B~E@EPgh@1hy48iodG~jW8Citpva$E289xzc{IxquGEXYc#W!2Ww^7zo}w}q^@ zCjt=0qjoi?P#+(3P%TB>X-vdCbXt^RM$ZT)v!{=_eR9&`{Z~|z+$v$k6Cm{ScK@-? zGwcmp_JE-Rx~K2z%IPy#qZj=qifAq%oG){zO--`?t5U{E(J2G2AalE@q}h|GPC9J* zOw zT2=>4ScGfwotsfrgrqSYA1P8!*C;M_lWT5^OxB;@^E3jxjWBdt9LxqCX=%e8F!xO= zXk?u4knQgrN8?);ibI+7JS`cqtPnohsY7K0s|NFHDwl5xyamAIw^jve>*d=3<==Yu zk}!OSsfz?)K0ue6!RHqR$V;hd5HU>tW&;nY4~)c1-2jO_jIN|3i}}OvlzYY!YoGCl znYAH8$g~Kod{KJIp{6klEdXvXPbwv1?zm6oNk^#ZR#AkL^Fxb_5Tw-8A|fGC+jdH; z(_o4Q(-SYEV~C-Jbcd~O{@b+Qa^`m6$^bf@8(0d{nol*o;k}mKhINK+TnE9Z~D3-1I6M%bP6r zFnu4BpjIuK7E^df#VNCDQqh&scFS(K;|1&{B3|`XX3u>gpxqOyS@moq5fA2uqx3@} z!cJor3Q4L!^O>GL(YUyHQ9W0lOXf)!tJxUiwowAvoBNoJc1FpsaIu6WErw}Hf*R!< z)J0~gkXcqvJAL4)fuhh?R0zqOWi84!vt0{ZH0(UI-$Gw))CH~N_E%twp@cQ}_L?ex zB$W&dx;+r0OCn7gjFqMwFb1>HVWDm21cn@jenFw&VF7S07&>VLpUNL4u@sso?9nv- z(?CO7^GqdPHrrQ%sLrkA(%Uj4l?qBs0XjR@&u;w5?L{A8E`CHSstQTpoi7O+S$#EQ zRDEWU!pFSruk!$+KfYqvVlldt`0*@%$*xE22vgiTyHX{Ub0fM(yk!lmnq^4Kh9y7%QvbTmb?XhtsLB$7iF+RLP!ZvX%frbvF8jN7E_>1X0^ z(9q-M6A;pMA^cfsdz3S zs{-@GbCXsFgad@aYx{$flc(>~nN+FWTumWU2w-RF5fwu%SE3-_a&G>sbqWl#CuTXn zYfEsxiWmVjUmJE5h%I#}{$ssexv}meK2UlE9Yr!xT7JVkZ(R5;Ew`$mzfpY-FUuM$c`mnqSS(TB!jdHC?)X% zwXgz(X+?lMP%2X@OQcDXPDJ3A4kB!l4OXGkJ!tp)(^N?S*pa3W`wnjg;IPZEfYe&F z7ORX!+bQw_I~&8aG*lL~*iC2~@&acofcT*SI@cZJ{4Ljr8zf|aEYBinNK0kKRV)iw zP}J;F_NxDHZ=TI;2i#vyBE?X>kDA`w5#tm|lEqD{p_AiuIj%(kmF*uqVS^twX2fRF zNC8Ye)YhISGnIj3#1s+KK!A4d|A|o4+8L%dh#R1}#Z9Eh0FR48Tl}8Tic{J7Cw-s> z*{u2q6eKqPMFnQU-l2Yup20vb6;`L zHD>~BEkY4?WiqC|FP>hM$m@x(71?TbSxb>AL< z-}@5$Nk%Oih@puIeM9nYsqh#oeyTXYa0u+;6U8$yv{-;z2y6=y@^kN$XxR8&R^x($ z&DG>bY0KuV%VRw=UpQJY;K_$bsjLvH2M48#@<~%>c3{ZWG%K(Gm!Xw#TgbzLxgK9@ zN?k$F413+w(xix$IwN4e07CA(OY?q>RtU)03UU_mmAv6zv4pI6Nl#03T6hQZx+7K9 zb#HL~p>vZxkM6>$D}XeM_kG3Dd6Wtk|B6eJZEWoQF-mLn{UOuN6W+yCO~LLxcKqq4 zig{9i;p6jXi6#{v#3o^J4<&&^3#oi+uK{jafw`88Y!zxTayUUJD{m^8Pqef{rf-2T0ni^qs#Fx0)OSDNCLz(S!!0NYjMB?1e+HI z(d6f7fi3|5;*kuKuDB`}ECA;qBM9fIToWM4vewR&WSvXz zSF|FIkgvUTu}_%5J!Q%PIjpl=vLObNhm+ejgoYkSZE9+`TufK%=ztV9dX4Lu*jU8Z zCujgyAHdj8adM3;?0iwHnKdeC))}TAEGnYB+`-VE41)FYQwMx4)Z0^UMF1rQgj4pp zSw2-EPU~)hV#L(($ETEC}1O)guitV!4%U0 zahgU1{n}Il9`W$xuqdx6`>hiV7%-l=_KPUT6K4QC1ufbp&rtX^;EF^{q6(71SB{C4 zo0{c45NUU)ilbLU{?E$#!FvzxR`1co?j1GCjo1A6$VA^haPo2xDl3K4iGE2k%bbq!eU)6JYWorfg#x(QqF{xNH$<|n6#WB;Z`lH zs7a~19Hh#oHFk8hE}^6)qrRvGE)hylTiB&#b>tAq`ObY#wRv?x7;u|VCwMHXQ2Qy; zB?Sh-BqYawH?YNi6wtz}BN+VYOU#>e-+!T{l>re#vF zQKsT#dHRPk5dpOkfPxa@F+?9{5Biq}+*6_GLkH9<-aghhz0u3p*-$2SgH>Cggyn&SWG1wLW;k2gF%_a0DK z=Rb7g#`067#p>x5SJp}$u8&Ik&ohdJ7A$*rIMC`(>RoD5{r`)oZgRLErp7M{qH6U z-+oS6Zp&w`5v3yo@x)hmdDq*1E6S&dNsXymkpgZq>c9P9#aSUC(ZFLx8mxS(zA6VB zJc9Y;*n})$b4mN}1W3Sz`PyEF70ET}fB@aTbD@U~IFA^c       Terms of Use
      • +
    • + + Translators +
    • Session log diff --git a/public/views/translators.html b/public/views/translators.html new file mode 100644 index 000000000..92d4a6652 --- /dev/null +++ b/public/views/translators.html @@ -0,0 +1,34 @@ +
      +
      + +
      +
      + Copay and Crowdin +
      +

      Translator

      +
        +
      • kinoshitajona Japanese
        • +
      • Kirvx French
        • +
      • HostFat Italian
        • +
      • koalalorenzo Italian
        • +
      • nicolazza Italian
        • +
      • saschad German
        • +
      • 8597fde7 German
        • +
      • pmichelazzo Portuguese
        • +
      • johnblazakis Greek
        • +
      • chek2fire1 Greek
        • +
      • cmgustavo83 Spanish
        • +
      +
      +
      +

      All contribution for translation of Copay is welcome. Sign up Crowdin.com and join to Copay project.

      + There are untranslated languages waiting for translators: Afrikaans, Albanian, Arabic, + Chinese Simplified, Czech, Danish, Dutch, Finnish, Hebrew, Hungarian, Italian, Korean, Norwegian, Polish, + Romanian, Russian, Swedish, Turkish, Ukranian, Vietnamese. +
      +
      +
      +
      diff --git a/src/js/routes.js b/src/js/routes.js index 8d056f72e..2c56b361c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -109,6 +109,16 @@ angular }); $stateProvider + .state('translators', { + url: '/translators', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/translators.html' + } + } + }) .state('disclaimer', { url: '/disclaimer', needProfile: false, @@ -476,6 +486,7 @@ angular preferencesEmail: 12, about: 12, logs: 13, + translators: 13, disclaimer: 13, add: 11, create: 12, From 428937a4bc757679ce6c5f2d81fdf4968f293646 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 10:43:46 -0300 Subject: [PATCH 078/158] Updates translators list and notes --- public/views/translators.html | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/public/views/translators.html b/public/views/translators.html index 92d4a6652..535d0d9e6 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -8,26 +8,29 @@
      Copay and Crowdin
      -

      Translator

      +

      Translation Credits

        -
      • kinoshitajona Japanese
        • -
      • Kirvx French
        • -
      • HostFat Italian
        • -
      • koalalorenzo Italian
        • -
      • nicolazza Italian
        • -
      • saschad German
        • -
      • 8597fde7 German
        • -
      • pmichelazzo Portuguese
        • -
      • johnblazakis Greek
        • -
      • chek2fire1 Greek
        • -
      • cmgustavo83 Spanish
        • +
      • kinoshitajonaJapanese
        • +
      • KirvxFrench
        • +
      • HostFatItalian
        • +
      • koalalorenzoItalian
        • +
      • nicolazzaItalian
        • +
      • saschadGerman
        • +
      • 8597fde7German
        • +
      • pmichelazzoPortuguese
        • +
      • johnblazakisGreek
        • +
      • chek2fire1Greek
        • +
      • cmgustavo83Spanish
      -

      All contribution for translation of Copay is welcome. Sign up Crowdin.com and join to Copay project.

      - There are untranslated languages waiting for translators: Afrikaans, Albanian, Arabic, - Chinese Simplified, Czech, Danish, Dutch, Finnish, Hebrew, Hungarian, Italian, Korean, Norwegian, Polish, - Romanian, Russian, Swedish, Turkish, Ukranian, Vietnamese. +

      + All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at + https://crowdin.com/project/copay. +

      + + Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. +
    From 458a17e0bed0c5d34c65b43512c036acc8261d41 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 15:26:16 -0300 Subject: [PATCH 079/158] Uses object for level options --- public/views/preferences.html | 2 +- public/views/preferencesFee.html | 2 +- src/js/controllers/index.js | 4 ++-- src/js/services/feeService.js | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 6f3c7db24..c5f31797e 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -81,7 +81,7 @@ Bitcoin Network Fee Policy - {{index.currentFeeLevel|translate}} + {{index.feeOpts[index.currentFeeLevel]|translate}}
  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index a1c2c4c84..cc9d8c9b6 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -7,7 +7,7 @@
    • - {{fee.level|translate}} + {{index.feeOpts[fee.level]|translate}}
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 737cb0520..c47660b94 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -10,12 +10,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r return (parseFloat(number.toPrecision(12))); }; - self.goHome = function() { go.walletHome(); }; - self.menu = [{ 'title': gettext('Home'), 'icon': 'icon-home', @@ -66,6 +64,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r isoCode: 'ja', }]; + self.feeOpts = feeService.feeOpts; + self.setOngoingProcess = function(processName, isOn) { $log.debug('onGoingProcess', processName, isOn); self[processName] = isOn; diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index c76c76223..99dde9bff 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -4,11 +4,11 @@ angular.module('copayApp.services').factory('feeService', function($log, profile var root = {}; // Constant fee options to translate - var feeOpts = [ - gettextCatalog.getString('priority'), - gettextCatalog.getString('normal'), - gettextCatalog.getString('economy') - ]; + root.feeOpts = { + priority: gettextCatalog.getString('Priority'), + normal: gettextCatalog.getString('Normal'), + economy: gettextCatalog.getString('Economy') + }; root.getCurrentFeeValue = function(cb) { var fc = profileService.focusedClient; From 0a169ca627c0cf5232005b3d86eb2b78ad92e036 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 15:28:14 -0300 Subject: [PATCH 080/158] Updates pot --- i18n/po/template.pot | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 571f32eea..1b5c24a14 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -406,6 +406,10 @@ msgstr "" msgid "ENTER" msgstr "" +#: src/js/services/feeService.js +msgid "Economy" +msgstr "" + #: public/views/preferences.html msgid "Email Notifications" msgstr "" @@ -674,6 +678,10 @@ msgstr "" msgid "No transactions yet" msgstr "" +#: src/js/services/feeService.js +msgid "Normal" +msgstr "" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" @@ -816,6 +824,10 @@ msgstr "" msgid "Preparing backup..." msgstr "" +#: src/js/services/feeService.js +msgid "Priority" +msgstr "" + #: public/views/modals/customized-amount.html msgid "QR Code" msgstr "" @@ -1222,10 +1234,6 @@ msgstr "" msgid "Your wallet has been imported correctly" msgstr "" -#: src/js/services/feeService.js -msgid "economy" -msgstr "" - #: public/views/preferencesEmail.html msgid "email for wallet notifications" msgstr "" @@ -1234,10 +1242,6 @@ msgstr "" msgid "locked by pending payments" msgstr "" -#: src/js/services/feeService.js -msgid "normal" -msgstr "" - #: public/views/copayers.html #: public/views/walletHome.html #: public/views/includes/sidebar.html @@ -1248,10 +1252,6 @@ msgstr "" msgid "optional" msgstr "" -#: src/js/services/feeService.js -msgid "priority" -msgstr "" - #: public/views/preferences.html msgid "settings" msgstr "" From dfd9a869f4ff8fa466c68d02d6fee2733f538f14 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 15:34:59 -0300 Subject: [PATCH 081/158] Replaces ENTER by OK in popup for encrypted private key --- public/views/includes/password.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/includes/password.html b/public/views/includes/password.html index 42cd98f79..5f59ca1b7 100644 --- a/public/views/includes/password.html +++ b/public/views/includes/password.html @@ -30,7 +30,7 @@
    • From 308ec270e461409ebc10ec97fc801335fac18e88 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Jul 2015 15:49:00 -0300 Subject: [PATCH 082/158] Removes translation for languages name --- public/views/preferencesLanguage.html | 2 +- src/js/controllers/index.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index 5672bb87f..ba6ef1ddd 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -11,7 +11,7 @@
    - {{lang.name|translate}} + {{lang.name}}
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 737cb0520..e7528e530 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -41,28 +41,28 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.tab = 'walletHome'; self.availableLanguages = [{ - name: gettext('English'), + name: 'English', isoCode: 'en', }, { - name: gettext('French'), + name: 'Français', isoCode: 'fr', }, { - name: gettext('Italian'), + name: 'Italiano', isoCode: 'it', }, { - name: gettext('German'), + name: 'Deutsch', isoCode: 'de', }, { - name: gettext('Spanish'), + name: 'Español', isoCode: 'es', }, { - name: gettext('Portuguese'), + name: 'Português', isoCode: 'pt', }, { - name: gettext('Greek'), + name: 'Ελληνικά', isoCode: 'el', }, { - name: gettext('Japanese'), + name: '日本語', isoCode: 'ja', }]; From e91dd505cee67bf10121c09aa1af65376c913017 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sun, 2 Aug 2015 22:12:41 +0900 Subject: [PATCH 083/158] Update template.pot --- i18n/po/template.pot | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 1b5c24a14..9ce819829 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -61,6 +61,10 @@ msgstr "" msgid "Alias for {{index.walletName}}" msgstr "" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "" @@ -394,6 +398,10 @@ msgstr "" msgid "Do not include private key in backup" msgstr "" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "" + #: public/views/walletHome.html msgid "Download CSV file" msgstr "" @@ -402,10 +410,6 @@ msgstr "" msgid "Download backup" msgstr "" -#: public/views/includes/password.html -msgid "ENTER" -msgstr "" - #: src/js/services/feeService.js msgid "Economy" msgstr "" @@ -422,10 +426,6 @@ msgstr "" msgid "Encrypted backup file saved" msgstr "" -#: src/js/controllers/index.js -msgid "English" -msgstr "" - #: public/views/includes/password.html msgid "Enter your password" msgstr "" @@ -473,7 +473,7 @@ msgstr "" msgid "Fetching Payment Information" msgstr "" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "" @@ -497,7 +497,7 @@ msgstr "" msgid "Generating .csv file..." msgstr "" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "" @@ -513,7 +513,7 @@ msgstr "" msgid "Go back" msgstr "" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "" @@ -581,11 +581,11 @@ msgstr "" msgid "Invitation to share a Copay Wallet" msgstr "" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Italian" msgstr "" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "" @@ -692,6 +692,10 @@ msgstr "" msgid "Note" msgstr "" +#: public/views/includes/password.html +msgid "OK" +msgstr "" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "" @@ -812,7 +816,7 @@ msgstr "" msgid "Please, select your backup file" msgstr "" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" msgstr "" @@ -1019,7 +1023,7 @@ msgstr "" msgid "Signing transaction" msgstr "" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "" @@ -1111,6 +1115,14 @@ msgstr "" msgid "Transaction" msgstr "" +#: public/views/translators.html +msgid "Translation Credits" +msgstr "" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "" From 88e1481a3ee46c66f6e1d0a3ce2f4ff976593b95 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 3 Aug 2015 12:01:51 -0300 Subject: [PATCH 084/158] Hide estimation time if nbBlocks is null --- public/views/preferencesFee.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index cc9d8c9b6..425164145 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -15,7 +15,9 @@
    - Average confirmation time: {{fee.nbBlocks * 10}} minutes.
    +
    + Average confirmation time: {{fee.nbBlocks * 10}} minutes. +
    Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB
    From 07b9fb39213b676b2a255ed625193de2ebe771a4 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Wed, 5 Aug 2015 15:25:54 -0700 Subject: [PATCH 085/158] txhistory of received payments show all outputs, including sender's change address --- public/views/modals/tx-details.html | 10 ++++++++-- src/js/controllers/index.js | 10 ++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 51df05a21..4ea64630b 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -29,11 +29,17 @@

    Details

      -
      +
    • + Note: + {{btx.message}} +
      • +
      +
      -
      diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 5989c3ca3..054f43f85 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -430,10 +430,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (tx.outputs) { tx.showSingle = false; tx.outputs.details = lodash.clone(tx.outputs); - tx.amount = lodash.reduce(tx.outputs.details, function(total, o) { - formatAmount(o); - return total + o.amount; - }, 0); + if (tx.action != 'received') { + tx.amount = lodash.reduce(tx.outputs.details, function(total, o) { + formatAmount(o); + return total + o.amount; + }, 0); + } tx.outputs.summary = { amount: tx.amount, message: tx.message, From d4e6ae98ef4d9645728d0f1bd4431e6cd32c1917 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Thu, 6 Aug 2015 15:30:19 +0300 Subject: [PATCH 086/158] Allow to provide custom templateUrl to txStatus --- src/js/services/txStatus.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/js/services/txStatus.js b/src/js/services/txStatus.js index 51e46ebe5..b9f8f29d3 100644 --- a/src/js/services/txStatus.js +++ b/src/js/services/txStatus.js @@ -1,9 +1,12 @@ 'use strict'; -angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout, gettext) { +angular.module('copayApp.services').factory('txStatus', function($modal, lodash, profileService, $timeout) { var root = {}; - root.notify = function(txp, cb) { + root.notify = function(txp, opts, cb) { + if (typeof opts == "function") { // we have no options + cb = opts; + } var fc = profileService.focusedClient; var status = txp.status; var type; @@ -34,10 +37,10 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, } } - root.openModal(type, cb); + openModal(type, opts, cb); }; - root.openModal = function(type, cb) { + var openModal = function(type, opts, cb) { var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.type = type; $scope.cancel = function() { @@ -46,7 +49,7 @@ angular.module('copayApp.services').factory('txStatus', function($modal, lodash, if (cb) $timeout(cb, 100); }; var modalInstance = $modal.open({ - templateUrl: 'views/modals/tx-status.html', + templateUrl: opts && opts.templateUrl ? opts.templateUrl : 'views/modals/tx-status.html', windowClass: 'full popup-tx-status closeModalAnimation', controller: ModalInstanceCtrl, }); From 823dc6f1a75f011d1e6ec6aefaed62ff94806eac Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Mon, 3 Aug 2015 14:21:12 +0300 Subject: [PATCH 087/158] Store the whole addon spec in addonManager --- src/js/services/addonManager.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/js/services/addonManager.js b/src/js/services/addonManager.js index 6a3aba52d..0749a37f5 100644 --- a/src/js/services/addonManager.js +++ b/src/js/services/addonManager.js @@ -1,23 +1,25 @@ 'use strict'; -angular.module('copayApp.services').provider('addonManager', function () { - var addonMenuItems = []; - var addonViews = []; +angular.module('copayApp.services').provider('addonManager', function (lodash) { + var addons = []; this.registerAddon = function(addonSpec) { - addonMenuItems.push(addonSpec.menuItem); - addonViews.push(addonSpec.view); + addons.push(addonSpec); }; this.$get = function() { var manager = {}; manager.addonMenuItems = function() { - return addonMenuItems; + return lodash.map(addons, function(addonSpec) { + return addonSpec.menuItem; + }); }; manager.addonViews = function() { - return addonViews; + return lodash.map(addons, function(addonSpec) { + return addonSpec.view; + }); }; return manager; From 56e91029daf182daf7ab4bce3bf4d824573cf08b Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Mon, 3 Aug 2015 15:49:07 +0300 Subject: [PATCH 088/158] Make addonManager to be service ..so it would be possible to use other services/factories/values when registering addon --- src/js/services/addonManager.js | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/js/services/addonManager.js b/src/js/services/addonManager.js index 0749a37f5..68d32c61a 100644 --- a/src/js/services/addonManager.js +++ b/src/js/services/addonManager.js @@ -1,28 +1,22 @@ 'use strict'; -angular.module('copayApp.services').provider('addonManager', function (lodash) { +angular.module('copayApp.services').service('addonManager', function (lodash) { var addons = []; - this.registerAddon = function(addonSpec) { + this.registerAddon = function (addonSpec) { addons.push(addonSpec); }; - this.$get = function() { - var manager = {}; + this.addonMenuItems = function () { + return lodash.map(addons, function (addonSpec) { + return addonSpec.menuItem; + }); + }; - manager.addonMenuItems = function() { - return lodash.map(addons, function(addonSpec) { - return addonSpec.menuItem; - }); - }; - - manager.addonViews = function() { - return lodash.map(addons, function(addonSpec) { - return addonSpec.view; - }); - }; - - return manager; - } + this.addonViews = function () { + return lodash.map(addons, function (addonSpec) { + return addonSpec.view; + }); + }; }); From 6e37cb30179ba9ba5590efddaa2873ad94c02e19 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Mon, 3 Aug 2015 15:49:44 +0300 Subject: [PATCH 089/158] Allow addons to customize pending proposals --- src/js/controllers/index.js | 1 + src/js/services/addonManager.js | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 5989c3ca3..5cd320d16 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -488,6 +488,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (tx.creatorId != self.copayerId) { self.pendingTxProposalsCountForUs = self.pendingTxProposalsCountForUs + 1; } + addonManager.formatPendingTxp(tx); }); self.txps = txps; }; diff --git a/src/js/services/addonManager.js b/src/js/services/addonManager.js index 68d32c61a..b50b44e1f 100644 --- a/src/js/services/addonManager.js +++ b/src/js/services/addonManager.js @@ -19,4 +19,12 @@ angular.module('copayApp.services').service('addonManager', function (lodash) { }); }; + this.formatPendingTxp = function (txp) { + lodash.each(addons, function (addon) { + if (addon.formatPendingTxp) { + addon.formatPendingTxp(txp); + } + }); + }; + }); From 949550c35d317e70870072cc135d8c2f424b2016 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Thu, 6 Aug 2015 07:23:47 -0700 Subject: [PATCH 090/158] isolate change specific to action = received --- public/views/modals/tx-details.html | 18 ++++++++++-------- src/js/controllers/index.js | 9 +++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 4ea64630b..ad1160134 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -30,18 +30,20 @@
        -
      • +
      • Note: {{btx.message}}
        • -
        -
        -
        +
        +
        +
        +
        +
      • To: diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 054f43f85..0beb0192e 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -430,11 +430,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (tx.outputs) { tx.showSingle = false; tx.outputs.details = lodash.clone(tx.outputs); + var total = lodash.reduce(tx.outputs.details, function(total, o) { + formatAmount(o); + return total + o.amount; + }, 0); if (tx.action != 'received') { - tx.amount = lodash.reduce(tx.outputs.details, function(total, o) { - formatAmount(o); - return total + o.amount; - }, 0); + tx.amount = total; } tx.outputs.summary = { amount: tx.amount, From 93028b9be08c8d05ecd57ad3bdacb2bc563e4f29 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Aug 2015 11:23:32 -0300 Subject: [PATCH 091/158] Fixes decimal inputs --- public/views/modals/customized-amount.html | 8 ++++---- public/views/walletHome.html | 14 ++++++++++---- src/js/directives/directives.js | 6 +++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html index d37f32dd5..8981f5738 100644 --- a/public/views/modals/customized-amount.html +++ b/public/views/modals/customized-amount.html @@ -53,8 +53,8 @@ Amount
        - + {{unitName}}
        @@ -63,8 +63,8 @@
        - + {{ alternativeIsoCode }}
        diff --git a/public/views/walletHome.html b/public/views/walletHome.html index a68d4fa86..06a71249e 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -382,8 +382,11 @@ Amount
        - - + + {{home.unitName}}
        • @@ -391,8 +394,11 @@
        - - + + {{ home.alternativeIsoCode }}
    diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 5696fd116..78376c647 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -87,22 +87,22 @@ angular.module('copayApp.directives') ]) .directive('validAmount', ['configService', '$locale', function(configService, locale) { - var formats = locale.NUMBER_FORMATS; return { require: 'ngModel', link: function(scope, element, attrs, ctrl) { var val = function(value) { + if (value) value = value.replace(/,/g, '.'); var settings = configService.getSync().wallet.settings; var vNum = Number((value * settings.unitToSatoshi).toFixed(0)); - if (typeof value == 'undefined') { + if (typeof value == 'undefined' || value == 0) { ctrl.$pristine = true; } if (typeof vNum == "number" && vNum > 0) { var decimals = Number(settings.unitDecimals); - var sep_index = ('' + value).indexOf(formats.DECIMAL_SEP); + var sep_index = ('' + value).indexOf('.'); var str_value = ('' + value).substring(sep_index + 1); if (sep_index > 0 && str_value.length > decimals) { ctrl.$setValidity('validAmount', false); From ce05318d94c141d8f59170a5ba7c93d57e5b3513 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Aug 2015 17:21:22 -0300 Subject: [PATCH 092/158] Replaces comma by dot --- public/views/modals/customized-amount.html | 6 ++-- public/views/walletHome.html | 8 +++--- src/js/controllers/walletHome.js | 8 ++++-- src/js/directives/directives.js | 33 ++++++++++++++++++++-- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html index 8981f5738..a50eb0764 100644 --- a/public/views/modals/customized-amount.html +++ b/public/views/modals/customized-amount.html @@ -55,7 +55,7 @@
    - + {{unitName}}
    @@ -64,8 +64,8 @@
    - + ng-model="_customAlternative" valid-alternative required autocomplete="off" pattern="[0-9]+([\.,][0-9]+)*" required> + {{ alternativeIsoCode }}
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 06a71249e..69df80a74 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -373,7 +373,7 @@ Not valid - + @@ -385,7 +385,7 @@ + ng-blur="home.formFocus(false)"> {{home.unitName}} @@ -396,8 +396,8 @@
    + ng-model="_alternative" valid-alternative required autocomplete="off" ng-focus="home.formFocus('amount')" + ng-blur="home.formFocus(false)"> {{ home.alternativeIsoCode }}
    diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 37b14ea88..db32b9769 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -475,6 +475,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.customAlternative = newValue; if (typeof(newValue) === 'number' && $scope.isRateAvailable) { $scope.customAmount = parseFloat((rateService.fromFiat(newValue, $scope.alternativeIsoCode) * satToUnit).toFixed($scope.unitDecimals), 10); + } else { + $scope.customAmount = null; } }, enumerable: true, @@ -491,7 +493,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (typeof(newValue) === 'number' && $scope.isRateAvailable) { $scope.customAlternative = parseFloat((rateService.toFiat(newValue * $scope.unitToSatoshi, $scope.alternativeIsoCode)).toFixed(2), 10); } else { - $scope.customAlternative = 0; + $scope.customAlternative = null; } $scope.alternativeAmount = $scope.customAlternative; }, @@ -625,6 +627,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.__alternative = newValue; if (typeof(newValue) === 'number' && self.isRateAvailable) { $scope._amount = parseFloat((rateService.fromFiat(newValue, self.alternativeIsoCode) * satToUnit).toFixed(self.unitDecimals), 10); + } else { + $scope.__amount = null; } }, enumerable: true, @@ -640,7 +644,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (typeof(newValue) === 'number' && self.isRateAvailable) { $scope.__alternative = parseFloat((rateService.toFiat(newValue * self.unitToSatoshi, self.alternativeIsoCode)).toFixed(2), 10); } else { - $scope.__alternative = 0; + $scope.__alternative = null; } self.alternativeAmount = $scope.__alternative; self.resetError(); diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 78376c647..6ca44a772 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -85,14 +85,14 @@ angular.module('copayApp.directives') }; } ]) - .directive('validAmount', ['configService', '$locale', - function(configService, locale) { + .directive('validAmount', ['configService', + function(configService) { return { require: 'ngModel', link: function(scope, element, attrs, ctrl) { var val = function(value) { - if (value) value = value.replace(/,/g, '.'); + if (value) value = Number(String(value).replace(/,/g, '.')); var settings = configService.getSync().wallet.settings; var vNum = Number((value * settings.unitToSatoshi).toFixed(0)); @@ -120,6 +120,33 @@ angular.module('copayApp.directives') }; } ]) + .directive('validAlternative', [ + function() { + + return { + require: 'ngModel', + link: function(scope, element, attrs, ctrl) { + var val = function(value) { + if (value) value = Number(String(value).replace(/,/g, '.')); + var vNum = Number(value); + + if (typeof value == 'undefined' || value == 0) { + ctrl.$pristine = true; + } + + if (typeof vNum == "number" && vNum > 0) { + ctrl.$setValidity('validAlternative', true); + } else { + ctrl.$setValidity('validAlternative', false); + } + return value; + } + ctrl.$parsers.unshift(val); + ctrl.$formatters.unshift(val); + } + }; + } + ]) .directive('walletSecret', function(bitcore) { return { require: 'ngModel', From 16d704ae499d4f68ceb3f45e7006f9beef5251bd Mon Sep 17 00:00:00 2001 From: Jameson Lopp Date: Sat, 8 Aug 2015 17:26:19 -0400 Subject: [PATCH 093/158] fix connection error messages to be grammatically correct --- i18n/po/de.po | 12 ++++++------ i18n/po/el.po | 12 ++++++------ i18n/po/es.po | 12 ++++++------ i18n/po/fr.po | 12 ++++++------ i18n/po/it.po | 12 ++++++------ i18n/po/ja.po | 12 ++++++------ i18n/po/pt.po | 12 ++++++------ i18n/po/template.pot | 12 ++++++------ src/js/controllers/walletHome.js | 14 +++++++------- 9 files changed, 55 insertions(+), 55 deletions(-) diff --git a/i18n/po/de.po b/i18n/po/de.po index f1d6c22d9..40a2c7e7a 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Änderung der Aliases hat nur Auswirkungen auf den lokalen Namen des Wallets" #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "Bitte die Verbindung prüfen und erneut probieren" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "In die Zwischenablage kopieren" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "Zahlung konnte nicht angenommen werden. Bitte die Verbindung überprüfen und erneut versuchen" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "Zahlung kann nicht übermittelt werden. Bitte die Verbindung prüfen und erneut probieren" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "Es kann keine Adresse erzeugt werden. Bitte Verbindung prüfen und erneut versuchen" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Datei kann nicht entschlüsselt werden, bitte das Passwort überprüfen" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "Die Zahlungsanweisung kann nicht gelöscht werden. Bitte Verbindung prüfen und erneut probieren" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Es konnte kein gültiger Bitcoin-QR-Code erkannt werden," #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "Zahlung kann nicht abgelehnt werden. Bitte Verbindung prüfen und erneut versuchen" #: src/js/controllers/walletHome.js diff --git a/i18n/po/el.po b/i18n/po/el.po index 81fd45f46..b795cc892 100644 --- a/i18n/po/el.po +++ b/i18n/po/el.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Αλλάζοντας το ψευδώνυμο του πορτοφολιού επηρεάζει μόνο το τοπικό όνομα πορτοφολιού." #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "Ελέγξτε την συνδεσή σας και προσπαθήστε ξανά" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Αντιγραφή στο πρόχειρο" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "Η πληρωμή δεν έγινε αποδεκτή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "Δεν μπορεί να αποσταλεί η πληρωμή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Δεν είναι δυνατή η σύνδεση στην υπηρεσία του πορτοφολιού. Ελέγξτε τη σύνδεσή σας και τη ρύθμιση παραμέτρων της υπηρεσίας του πορτοφολίου." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "Δεν είναι δυνατή η δημιουργία διεύθυνσης. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση του αρχείου, ελέγξτε τον κωδικό σας" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "Δεν ήταν δυνατή η διαγραφή της πρότασης πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Δεν ήταν δυνατή η αναγνώριση ενός έγκυρου κωδικού QR για Βitcoin" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "Δεν είναι δυνατή η απόρριψη της πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js diff --git a/i18n/po/es.po b/i18n/po/es.po index 9b5031801..2aa66e0ed 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Cambiar el alias del monedero solo afecta al nombre del monedero local." #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "Verifique su conexión e inténtelo nuevamente" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copiar al portapapeles" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "No se pudo aceptar el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "No se pudo emitir el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "No se pudo conectar con Wallet Service. Verifique la conexión a internet y la configuración a Wallet Service." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "No se pudo crear la dirección. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "No se pudo desencriptar el archivo, verifique su contraseña" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "No se pudo eliminar la propuesta de pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "No se reconoció un código QR de Bitcoin válido" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "No se pudo rechazar el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js diff --git a/i18n/po/fr.po b/i18n/po/fr.po index befa8c1c1..cfaa89314 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "La modification d'un alias de portefeuille affecte uniquement le nom du portefeuille local." #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "Vérifiez votre connexion internet et réessayez" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copier dans le presse-papier" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "Impossible d'accepter le paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "Impossible de diffuser le paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Impossible de se connecter au service de portefeuille. Vérifiez votre connexion Internet et la configuration de votre service de portefeuille." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "Impossible de créer l'adresse. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "Impossible de supprimer la proposition de paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Impossible de reconnaître un code QR Bitcoin valide" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "Impossible de rejeter le paiement. Vérifiez votre connexion internet réessayez" #: src/js/controllers/walletHome.js diff --git a/i18n/po/it.po b/i18n/po/it.po index 94f57bbd1..69f52dfeb 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Il cambiamento degli alias dei portafogli influenza solo il nome del portafoglio locale." #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "Verifica la connessione e riprova" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copia negli appunti" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "Impossibile accettare il pagamento. Controlla la connessione e riprova di nuovo" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "Impossibile trasmettere il pagamento. Controlla la connessione e riprova" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Impossibile connettersi al servizio portafoglio. Verifica la tua connessione Internet e la configurazione del servizio portafoglio." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "Impossibile creare l'indirizzo. Verifica la tua connessione e prova di nuovo" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Impossibile decrittografare il file, controlla la tua password" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "Impossibile eliminare la proposta di pagamento. Verifica la tua connessione e prova di nuovo" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Impossibile riconoscere un Codice QR Bitcoin valido" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "Impossibile rifiutare il pagamento. Verifica la tua connessione e prova di nuovo" #: src/js/controllers/walletHome.js diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 31d11ced6..23a2de1b4 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -183,7 +183,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "ウォレット通称を変更しても、この端末でしか変わりません。" #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "接続を確認し、やり直して下さい。" #: public/views/import.html @@ -232,11 +232,11 @@ msgid "Copy to clipboard" msgstr "クリップボードへコピー" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "送金の提案が承諾できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "送金できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js @@ -244,7 +244,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "ウォレットサービスと接続できませんでした。インターネットの接続とウォレットサービスの設定を確認して下さい。" #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "アドレスが生成できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js @@ -260,7 +260,7 @@ msgid "Could not decrypt file, check your password" msgstr "複合化できませんでした。パスワードが正しいかご確認下さい。" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "送金の提案が削除できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js @@ -288,7 +288,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "有効なビットコインQRコードが認識できませんでした。" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "送金の提案を却下できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js diff --git a/i18n/po/pt.po b/i18n/po/pt.po index ee04d2efc..cee159750 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Alterando o apelido da carteira somente afeta o nome da carteira local." #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "Verifique sua conexão e tente novamente" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copiar para área de transferência" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "Não foi possível aceitar pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "Não foi possível transmitir pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "Não foi possível criar o endereço. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "Não foi possível apagar a proposta de pagamento. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Could not recognize a valid Bitcoin QR Code" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "Não é possível rejeitar o pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 9ce819829..7c4e1ecaa 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -192,7 +192,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "" #: src/js/controllers/walletHome.js -msgid "Check you connection and try again" +msgid "Check your Internet connection and try again" msgstr "" #: public/views/import.html @@ -254,11 +254,11 @@ msgid "Copy to clipboard" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" +msgid "Could not accept payment. Check your Internet connection and try again" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" +msgid "Could not broadcast payment. Check your Internet connection and try again" msgstr "" #: src/js/controllers/walletHome.js @@ -266,7 +266,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" +msgid "Could not create address. Check your Internet connection and try again" msgstr "" #: src/js/controllers/walletHome.js @@ -282,7 +282,7 @@ msgid "Could not decrypt file, check your password" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" +msgid "Could not delete payment proposal. Check your Internet connection and try again" msgstr "" #: src/js/controllers/walletHome.js @@ -310,7 +310,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" +msgid "Could not reject payment. Check your Internet connection and try again" msgstr "" #: src/js/controllers/walletHome.js diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index db32b9769..efa6e28f7 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -265,7 +265,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (err) { $scope.loading = false; parseError(err); - $scope.error = err.message || gettext('Could not accept payment. Check you connection and try again'); + $scope.error = err.message || gettext('Could not accept payment. Check your Internet connection and try again'); $scope.$digest(); } else { //if txp has required signatures then broadcast it @@ -278,7 +278,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.loading = false; if (err) { parseError(err); - $scope.error = gettext('Could not broadcast payment. Check you connection and try again'); + $scope.error = gettext('Could not broadcast payment. Check your Internet connection and try again'); $scope.$digest(); } else { $log.debug('Transaction signed and broadcasted') @@ -308,7 +308,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.loading = false; if (err) { parseError(err); - $scope.error = err.message || gettext('Could not reject payment. Check you connection and try again'); + $scope.error = err.message || gettext('Could not reject payment. Check your Internet connection and try again'); $scope.$digest(); } else { $modalInstance.close(txpr); @@ -330,7 +330,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi // Hacky: request tries to parse an empty response if (err && !(err.message && err.message.match(/Unexpected/))) { parseError(err); - $scope.error = err.message || gettext('Could not delete payment proposal. Check you connection and try again'); + $scope.error = err.message || gettext('Could not delete payment proposal. Check your Internet connection and try again'); $scope.$digest(); return; } @@ -349,7 +349,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.loading = false; if (err) { parseError(err); - $scope.error = err.message || gettext('Could not broadcast payment. Check you connection and try again'); + $scope.error = err.message || gettext('Could not broadcast payment. Check your Internet connection and try again'); $scope.$digest(); } else { @@ -421,7 +421,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (err) { parseError(err); - self.addrError = err.message || gettext('Could not create address. Check you connection and try again'); + self.addrError = err.message || gettext('Could not create address. Check your Internet connection and try again'); } if (addr) @@ -675,7 +675,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi //This are abnormal situations, but still err message will not be translated //(the should) we should switch using err.code and use proper gettext messages - errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again')); + errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check your Internet connection and try again')); this.error = errMessage; From d853cf12b7fca1a427f516e47e18a5fed50eb1ca Mon Sep 17 00:00:00 2001 From: Jameson Lopp Date: Sat, 8 Aug 2015 18:19:15 -0400 Subject: [PATCH 094/158] don't modify .po files --- i18n/po/de.po | 12 ++++++------ i18n/po/el.po | 12 ++++++------ i18n/po/es.po | 12 ++++++------ i18n/po/fr.po | 12 ++++++------ i18n/po/it.po | 12 ++++++------ i18n/po/ja.po | 12 ++++++------ i18n/po/pt.po | 12 ++++++------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/i18n/po/de.po b/i18n/po/de.po index 40a2c7e7a..f1d6c22d9 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Änderung der Aliases hat nur Auswirkungen auf den lokalen Namen des Wallets" #: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" +msgid "Check you connection and try again" msgstr "Bitte die Verbindung prüfen und erneut probieren" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "In die Zwischenablage kopieren" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment. Check you connection and try again" msgstr "Zahlung konnte nicht angenommen werden. Bitte die Verbindung überprüfen und erneut versuchen" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment. Check you connection and try again" msgstr "Zahlung kann nicht übermittelt werden. Bitte die Verbindung prüfen und erneut probieren" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +msgid "Could not create address. Check you connection and try again" msgstr "Es kann keine Adresse erzeugt werden. Bitte Verbindung prüfen und erneut versuchen" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Datei kann nicht entschlüsselt werden, bitte das Passwort überprüfen" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "Die Zahlungsanweisung kann nicht gelöscht werden. Bitte Verbindung prüfen und erneut probieren" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Es konnte kein gültiger Bitcoin-QR-Code erkannt werden," #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment. Check you connection and try again" msgstr "Zahlung kann nicht abgelehnt werden. Bitte Verbindung prüfen und erneut versuchen" #: src/js/controllers/walletHome.js diff --git a/i18n/po/el.po b/i18n/po/el.po index b795cc892..81fd45f46 100644 --- a/i18n/po/el.po +++ b/i18n/po/el.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Αλλάζοντας το ψευδώνυμο του πορτοφολιού επηρεάζει μόνο το τοπικό όνομα πορτοφολιού." #: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" +msgid "Check you connection and try again" msgstr "Ελέγξτε την συνδεσή σας και προσπαθήστε ξανά" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Αντιγραφή στο πρόχειρο" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment. Check you connection and try again" msgstr "Η πληρωμή δεν έγινε αποδεκτή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment. Check you connection and try again" msgstr "Δεν μπορεί να αποσταλεί η πληρωμή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Δεν είναι δυνατή η σύνδεση στην υπηρεσία του πορτοφολιού. Ελέγξτε τη σύνδεσή σας και τη ρύθμιση παραμέτρων της υπηρεσίας του πορτοφολίου." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +msgid "Could not create address. Check you connection and try again" msgstr "Δεν είναι δυνατή η δημιουργία διεύθυνσης. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση του αρχείου, ελέγξτε τον κωδικό σας" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "Δεν ήταν δυνατή η διαγραφή της πρότασης πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Δεν ήταν δυνατή η αναγνώριση ενός έγκυρου κωδικού QR για Βitcoin" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment. Check you connection and try again" msgstr "Δεν είναι δυνατή η απόρριψη της πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" #: src/js/controllers/walletHome.js diff --git a/i18n/po/es.po b/i18n/po/es.po index 2aa66e0ed..9b5031801 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Cambiar el alias del monedero solo afecta al nombre del monedero local." #: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" +msgid "Check you connection and try again" msgstr "Verifique su conexión e inténtelo nuevamente" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copiar al portapapeles" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment. Check you connection and try again" msgstr "No se pudo aceptar el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment. Check you connection and try again" msgstr "No se pudo emitir el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "No se pudo conectar con Wallet Service. Verifique la conexión a internet y la configuración a Wallet Service." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +msgid "Could not create address. Check you connection and try again" msgstr "No se pudo crear la dirección. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "No se pudo desencriptar el archivo, verifique su contraseña" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "No se pudo eliminar la propuesta de pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "No se reconoció un código QR de Bitcoin válido" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment. Check you connection and try again" msgstr "No se pudo rechazar el pago. Verifique su conexión e inténtelo nuevamente" #: src/js/controllers/walletHome.js diff --git a/i18n/po/fr.po b/i18n/po/fr.po index cfaa89314..befa8c1c1 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "La modification d'un alias de portefeuille affecte uniquement le nom du portefeuille local." #: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" +msgid "Check you connection and try again" msgstr "Vérifiez votre connexion internet et réessayez" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copier dans le presse-papier" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment. Check you connection and try again" msgstr "Impossible d'accepter le paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment. Check you connection and try again" msgstr "Impossible de diffuser le paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Impossible de se connecter au service de portefeuille. Vérifiez votre connexion Internet et la configuration de votre service de portefeuille." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +msgid "Could not create address. Check you connection and try again" msgstr "Impossible de créer l'adresse. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "Impossible de supprimer la proposition de paiement. Vérifiez votre connexion internet et réessayez" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Impossible de reconnaître un code QR Bitcoin valide" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment. Check you connection and try again" msgstr "Impossible de rejeter le paiement. Vérifiez votre connexion internet réessayez" #: src/js/controllers/walletHome.js diff --git a/i18n/po/it.po b/i18n/po/it.po index 69f52dfeb..94f57bbd1 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Il cambiamento degli alias dei portafogli influenza solo il nome del portafoglio locale." #: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" +msgid "Check you connection and try again" msgstr "Verifica la connessione e riprova" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copia negli appunti" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment. Check you connection and try again" msgstr "Impossibile accettare il pagamento. Controlla la connessione e riprova di nuovo" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment. Check you connection and try again" msgstr "Impossibile trasmettere il pagamento. Controlla la connessione e riprova" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Impossibile connettersi al servizio portafoglio. Verifica la tua connessione Internet e la configurazione del servizio portafoglio." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +msgid "Could not create address. Check you connection and try again" msgstr "Impossibile creare l'indirizzo. Verifica la tua connessione e prova di nuovo" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Impossibile decrittografare il file, controlla la tua password" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "Impossibile eliminare la proposta di pagamento. Verifica la tua connessione e prova di nuovo" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Impossibile riconoscere un Codice QR Bitcoin valido" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment. Check you connection and try again" msgstr "Impossibile rifiutare il pagamento. Verifica la tua connessione e prova di nuovo" #: src/js/controllers/walletHome.js diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 23a2de1b4..31d11ced6 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -183,7 +183,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "ウォレット通称を変更しても、この端末でしか変わりません。" #: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" +msgid "Check you connection and try again" msgstr "接続を確認し、やり直して下さい。" #: public/views/import.html @@ -232,11 +232,11 @@ msgid "Copy to clipboard" msgstr "クリップボードへコピー" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment. Check you connection and try again" msgstr "送金の提案が承諾できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment. Check you connection and try again" msgstr "送金できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js @@ -244,7 +244,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "ウォレットサービスと接続できませんでした。インターネットの接続とウォレットサービスの設定を確認して下さい。" #: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +msgid "Could not create address. Check you connection and try again" msgstr "アドレスが生成できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js @@ -260,7 +260,7 @@ msgid "Could not decrypt file, check your password" msgstr "複合化できませんでした。パスワードが正しいかご確認下さい。" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "送金の提案が削除できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js @@ -288,7 +288,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "有効なビットコインQRコードが認識できませんでした。" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment. Check you connection and try again" msgstr "送金の提案を却下できませんでした。接続を確認し、やり直して下さい。" #: src/js/controllers/walletHome.js diff --git a/i18n/po/pt.po b/i18n/po/pt.po index cee159750..ee04d2efc 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -182,7 +182,7 @@ msgid "Changing wallet alias only affects the local wallet name." msgstr "Alterando o apelido da carteira somente afeta o nome da carteira local." #: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" +msgid "Check you connection and try again" msgstr "Verifique sua conexão e tente novamente" #: public/views/import.html @@ -231,11 +231,11 @@ msgid "Copy to clipboard" msgstr "Copiar para área de transferência" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment. Check you connection and try again" msgstr "Não foi possível aceitar pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment. Check you connection and try again" msgstr "Não foi possível transmitir pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js @@ -243,7 +243,7 @@ msgid "Could not connect wallet service. Check your Internet connection and your msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." #: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +msgid "Could not create address. Check you connection and try again" msgstr "Não foi possível criar o endereço. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js @@ -259,7 +259,7 @@ msgid "Could not decrypt file, check your password" msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal. Check you connection and try again" msgstr "Não foi possível apagar a proposta de pagamento. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js @@ -287,7 +287,7 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Could not recognize a valid Bitcoin QR Code" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment. Check you connection and try again" msgstr "Não é possível rejeitar o pagamentos. Verifique sua conexão e tente novamente" #: src/js/controllers/walletHome.js From 779db5a06c01fb4bfc6041f1de6c5a77317103b1 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 3 Aug 2015 20:39:09 -0300 Subject: [PATCH 095/158] Advanced send options --- public/views/preferences.html | 4 +++ public/views/walletHome.html | 27 ++++++++++++++++++ src/js/controllers/index.js | 9 ++++++ src/js/controllers/preferences.js | 16 +++++++++++ src/js/controllers/walletHome.js | 46 ++++++++++--------------------- src/js/services/feeService.js | 4 +-- 6 files changed, 73 insertions(+), 33 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index c5f31797e..41dccf56c 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -84,6 +84,10 @@ {{index.feeOpts[index.currentFeeLevel]|translate}} +
  • + Spend Unconfirmed Transaction + +
  • Bitcore Wallet Service diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 69df80a74..349bb8c93 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -418,6 +418,33 @@ + +
    +

    Fee policy for this transaction

    +
      +
    • + {{index.feeOpts[fee.level]|translate}} + +
      • +
    +

    Spend unconfirmed transaction

    +
    + Use unconfirmed in this transaction + +
    +
    + +
    Cancel diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 775acfcdc..15ce7f58b 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -279,6 +279,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r $log.debug('Wallet Status:', walletStatus); self.setPendingTxps(walletStatus.pendingTxps); self.setFees(); + self.setSpendUnconfirmed(); // Status Shortcuts self.walletName = walletStatus.wallet.name; @@ -306,6 +307,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; + self.setSpendUnconfirmed = function() { + self.spendUnconfirmed = configService.getSync().wallet.spendUnconfirmed; + }; + self.setCurrentFeeLevel = function(level) { self.currentFeeLevel = level || configService.getSync().wallet.settings.feeLevel || 'priority'; }; @@ -855,6 +860,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }); + $rootScope.$on('Local/SpendUnconfirmedUpdated', function(event) { + self.setSpendUnconfirmed(); + }); + $rootScope.$on('Local/FeeLevelUpdated', function(event, level) { self.setCurrentFeeLevel(level); }); diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 742db5a84..c562785bb 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -9,10 +9,25 @@ angular.module('copayApp.controllers').controller('preferencesController', name: config.wallet.settings.alternativeName, isoCode: config.wallet.settings.alternativeIsoCode }; + $scope.spendUnconfirmed = config.wallet.spendUnconfirmed; var fc = profileService.focusedClient; if (fc) $scope.encrypt = fc.hasPrivKeyEncrypted(); + var unwatchSpendUnconfirmed = $scope.$watch('spendUnconfirmed', function(newVal, oldVal) { + if (newVal == oldVal) return; + var opts = { + wallet: { + spendUnconfirmed: newVal + } + }; + $rootScope.$emit('Local/SpendUnconfirmedUpdated'); + + configService.set(opts, function(err) { + if (err) $log.debug(err); + }); + }); + var unwatch = $scope.$watch('encrypt', function(val) { var fc = profileService.focusedClient; if (!fc) return; @@ -49,5 +64,6 @@ angular.module('copayApp.controllers').controller('preferencesController', $scope.$on('$destroy', function() { unwatch(); + unwatchSpendUnconfirmed(); }); }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index efa6e28f7..ec96ba394 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var self = this; $rootScope.hideMenuBar = false; $rootScope.wpInputFocused = false; + $scope.currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed; // INIT var config = configService.getSync().wallet.settings; @@ -538,6 +539,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi // Send + var unwatchSpendUnconfirmed = $scope.$watch('currentSpendUnconfirmed', function(newVal, oldVal) { + if (newVal == oldVal) return; + $scope.currentSpendUnconfirmed = newVal; + }); + + $scope.$on('$destroy', function() { + unwatchSpendUnconfirmed(); + }); + this.canShowAlternative = function() { return $scope.showAlternative; }; @@ -736,7 +746,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi address = form.address.$modelValue; amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0)); - feeService.getCurrentFeeValue(function(err, feePerKb) { + feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) { if (err) $log.debug(err); fc.sendTxProposal({ toAddress: address, @@ -744,6 +754,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi message: comment, payProUrl: paypro ? paypro.url : null, feePerKb: feePerKb, + excludeUnconfirmedUtxos: $scope.currentSpendUnconfirmed ? false : true }, function(err, txp) { if (err) { self.setOngoingProcess(); @@ -848,6 +859,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.lockAddress = false; this.lockAmount = false; + this.currentSendFeeLevel = null; + this.hideAdvSend = true; + $scope.currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed; this._amount = this._address = null; @@ -985,36 +999,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } }; - // Advanced SEND: set temporary fee policy for each transaction - this.openAdvancedSendModal = function(feeLevels, currentFeeLevel) { - var fc = profileService.focusedClient; - - var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.feeLevels = feeLevels; - $scope.currentFeeLevel = currentFeeLevel - $scope.network = fc.credentials.network; - $scope.color = fc.backgroundColor; - $scope.save = function(level) { - $scope.currentFeeLevel = level; - }; - - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - }; - var modalInstance = $modal.open({ - templateUrl: 'views/modals/advancedSend.html', - windowClass: 'full animated slideInUp', - controller: ModalInstanceCtrl - }); - - modalInstance.result.finally(function() { - var m = angular.element(document.getElementsByClassName('reveal-modal')); - m.addClass('slideOutDown'); - }); - }; - - // History function strip(number) { diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index 99dde9bff..e77901bc4 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -10,10 +10,10 @@ angular.module('copayApp.services').factory('feeService', function($log, profile economy: gettextCatalog.getString('Economy') }; - root.getCurrentFeeValue = function(cb) { + root.getCurrentFeeValue = function(currentSendFeeLevel, cb) { var fc = profileService.focusedClient; var config = configService.getSync().wallet.settings; - var feeLevel = config.feeLevel || 'normal'; + var feeLevel = currentSendFeeLevel || config.feeLevel || 'normal'; // static fee var fee = 10000; fc.getFeeLevels(fc.credentials.network, function(err, levels) { From 12d132c37a873dc0dda045a4a116d9b4cb4b7b0d Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Aug 2015 10:44:29 -0300 Subject: [PATCH 096/158] Updates angular-bwc and new error messages --- bower.json | 2 +- src/js/controllers/index.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 572438ec3..93266daf7 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "ng-lodash": "~0.2.0", "angular-moment": "~0.10.1", "moment": "~2.10.3", - "angular-bitcore-wallet-client": "^0.0.28", + "angular-bitcore-wallet-client": "^0.1.1", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", "fastclick": "*", diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 15ce7f58b..bb0a1b9ad 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -400,9 +400,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.handleError = function(err) { $log.warn('Client ERROR:', err); - if (err.code === 'NOTAUTHORIZED') { + if (err.code === 'NOT_AUTHORIZED') { $scope.$emit('Local/NotAuthorized'); - } else if (err.code === 'NOTFOUND') { + } else if (err.code === 'NOT_FOUND') { $scope.$emit('Local/BWSNotFound'); } else { $scope.$emit('Local/ClientError', (err.error ? err.error : err)); @@ -960,12 +960,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); $rootScope.$on('Local/ClientError', function(event, err) { - if (err.code && err.code === 'NOTAUTHORIZED') { + if (err.code && err.code === 'NOT_AUTHORIZED') { // Show not error, just redirect to home (where the recreate option is shown) go.walletHome(); } else if (err && err.cors == 'rejected') { $log.debug('CORS error:', err); - } else if (err.code === 'ETIMEDOUT' || err.code === 'CONNERROR') { + } else if (err.code === 'ETIMEDOUT' || err.code === 'CONNECTION_ERROR') { $log.debug('Time out:', err); } else { var msg = 'Error at Wallet Service: '; From 4a79dbd01f4c442aa10d9a75239b90e2b0238a62 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Aug 2015 12:56:25 -0300 Subject: [PATCH 097/158] Fix layout. Adds spend unconfirmed to txp details --- public/views/includes/output.html | 2 +- public/views/modals/txp-details.html | 4 ++++ public/views/walletHome.html | 34 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/public/views/includes/output.html b/public/views/includes/output.html index d217412b2..2fb157df1 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,4 +1,4 @@ -
    +
  • Recipients: {{output.recipientCount}} diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 783668dae..c1abe1c16 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -30,6 +30,10 @@ Fee: {{feeStr}}
    • +
  • + Spend Unconfirmed Transactions: + {{(tx.excludeUnconfirmedUtxos ? 'No' : 'Yes')|translate}} +
  • Time: diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 349bb8c93..986297b7d 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -418,29 +418,29 @@ -
    - +
    + Show Advanced options Hide Advanced options -
    -
    -

    Fee policy for this transaction

    -
      -
    • - {{index.feeOpts[fee.level]|translate}} - -
      • -
    -

    Spend unconfirmed transaction

    -
    - Use unconfirmed in this transaction - +
    +

    Fee policy for this transaction

    +
      +
    • + {{index.feeOpts[fee.level]|translate}} + +
      • +
    +

    Unconfirmed transactions for this transaction

    +
    + Spend Unconfirmed Transactions + +
    From a034c832beb4f0ef711ba34956b8c6ebd37608c4 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Aug 2015 14:07:09 -0300 Subject: [PATCH 098/158] Fix typos. Updates with suggestions --- public/views/modals/txp-details.html | 2 +- public/views/preferences.html | 2 +- public/views/walletHome.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index c1abe1c16..6460111a2 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -31,7 +31,7 @@ {{feeStr}}
  • - Spend Unconfirmed Transactions: + Uses unconfirmed funds: {{(tx.excludeUnconfirmedUtxos ? 'No' : 'Yes')|translate}}
  • diff --git a/public/views/preferences.html b/public/views/preferences.html index 41dccf56c..416dd9522 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -85,7 +85,7 @@
  • - Spend Unconfirmed Transaction + Use Unconfirmed Funds
  • diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 986297b7d..951e56c88 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -436,9 +436,9 @@ ng-show="(home.currentSendFeeLevel || index.currentFeeLevel) == fee.level">
    • -

    Unconfirmed transactions for this transaction

    +

    Use unconfirmed funds for this transaction

    - Spend Unconfirmed Transactions + Use Unconfirmed Funds
    From d8a155a0e81c88881e8140b2fc5829eaa59bba45 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Aug 2015 16:34:05 -0300 Subject: [PATCH 099/158] Hide options if it is the old bws --- public/views/preferences.html | 5 +++-- public/views/preferencesFee.html | 2 +- public/views/walletHome.html | 22 ++++++++++++---------- src/js/services/feeService.js | 8 ++------ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 416dd9522..3f1e1d0cf 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -77,11 +77,12 @@ {{preferences.selectedAlternative.name}} -
  • +
  • Bitcoin Network Fee Policy - {{index.feeOpts[index.currentFeeLevel]|translate}} + {{index.feeOpts[index.currentFeeLevel]|translate}}
  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 425164145..7eb64566d 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -7,7 +7,7 @@
    • - {{index.feeOpts[fee.level]|translate}} + {{index.feeOpts[fee.level]|translate}}
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 951e56c88..02ecebe38 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -427,16 +427,18 @@
    -

    Fee policy for this transaction

    -
      -
    • - {{index.feeOpts[fee.level]|translate}} - -
      • -
    -

    Use unconfirmed funds for this transaction

    +
    +

    Fee policy for this transaction

    +
      +
    • + {{index.feeOpts[fee.level]|translate}} + +
      • +
    +
    +

     

    Use Unconfirmed Funds diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index e77901bc4..3b7f810ce 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('feeService', function($log, profileService, configService, gettextCatalog) { +angular.module('copayApp.services').factory('feeService', function($log, profileService, configService, gettextCatalog, lodash) { var root = {}; // Constant fee options to translate @@ -21,11 +21,7 @@ angular.module('copayApp.services').factory('feeService', function($log, profile return cb({message: 'Could not get dynamic fee. Using static 10000sat'}, fee); } else { - for (var i = 0; i < 3; i++) { - if (levels[i].level == feeLevel) { - fee = levels[i].feePerKB; - } - } + fee = lodash.find(levels, { level: feeLevel }).feePerKB; $log.debug('Dynamic fee for ' + feeLevel + ': ' + fee); return cb(null, fee); } From 45c32371d671b7bd725a1976fd535315e960956f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 5 Aug 2015 16:44:58 -0300 Subject: [PATCH 100/158] Fixes some capitalized words --- public/views/backup.html | 4 ++-- public/views/create.html | 4 ++-- public/views/join.html | 4 ++-- public/views/walletHome.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index d3cb3387b..f0f0d7a22 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -38,8 +38,8 @@
    - Show Advanced options - Hide Advanced options + Show advanced options + Hide advanced options diff --git a/public/views/create.html b/public/views/create.html index d721f7b13..83f02975d 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -81,8 +81,8 @@
    - Show Advanced options - Hide Advanced options + Show advanced options + Hide advanced options diff --git a/public/views/join.html b/public/views/join.html index c18aed109..7c4a19f8a 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -66,8 +66,8 @@ - Show Advanced options - Hide Advanced options + Show advanced options + Hide advanced options diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 02ecebe38..a9353d02c 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -421,8 +421,8 @@
    - Show Advanced options - Hide Advanced options + Show advanced options + Hide advanced options From 3e87998981b8dc8d5e51b8228f97fa907340d370 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 10 Aug 2015 11:31:23 -0300 Subject: [PATCH 101/158] Updates template.pot --- i18n/po/template.pot | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 7c4e1ecaa..9b384c51c 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -468,6 +468,10 @@ msgstr "" msgid "Fee Policy" msgstr "" +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -524,7 +528,8 @@ msgstr "" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" +#: public/views/walletHome.html +msgid "Hide advanced options" msgstr "" #: src/js/controllers/index.js @@ -689,6 +694,7 @@ msgstr "" #: public/views/walletHome.html #: public/views/includes/output.html +#: public/views/modals/tx-details.html msgid "Note" msgstr "" @@ -1012,7 +1018,8 @@ msgstr "" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" +#: public/views/walletHome.html +msgid "Show advanced options" msgstr "" #: src/js/controllers/walletHome.js @@ -1148,6 +1155,15 @@ msgstr "" msgid "Updating Wallet..." msgstr "" +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "" + +#: public/views/modals/txp-details.html +msgid "Uses unconfirmed funds" +msgstr "" + #: public/views/preferencesAbout.html msgid "Version" msgstr "" From 1613062f48baa7f162edc2a542109edb2f0904f2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 11 Aug 2015 01:21:50 -0300 Subject: [PATCH 102/158] Disables alert() function for chromeapp --- src/js/controllers/index.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index bb0a1b9ad..e8a820836 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -752,7 +752,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r 'Wallet Server Error', ['OK'] ); } else { - alert(err); + if (!isChromeApp) { + alert(err); + } } }; @@ -764,7 +766,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r 'Device Error', ['OK'] ); } else { - alert(err); + if (!isChromeApp) { + alert(err); + } } }; From 48d6b7866755e26cedc48d3832a9ed84883aa0a0 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 11 Aug 2015 17:11:40 -0300 Subject: [PATCH 103/158] WIP send max fixes --- public/views/walletHome.html | 2 +- src/js/controllers/index.js | 50 ++++++++++++++++++++++---------- src/js/controllers/walletHome.js | 5 ++++ src/js/services/feeService.js | 2 +- 4 files changed, 41 insertions(+), 18 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index a9353d02c..57f28cd22 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -431,7 +431,7 @@

    Fee policy for this transaction

    • + ng-click="home.setFee(fee.level)" class="line-b p20"> {{index.feeOpts[fee.level]|translate}} diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index e8a820836..6559dbd7f 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -278,7 +278,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r } $log.debug('Wallet Status:', walletStatus); self.setPendingTxps(walletStatus.pendingTxps); - self.setFees(); + self.setFeesOpts(); self.setSpendUnconfirmed(); // Status Shortcuts @@ -311,17 +311,40 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.spendUnconfirmed = configService.getSync().wallet.spendUnconfirmed; }; - self.setCurrentFeeLevel = function(level) { - self.currentFeeLevel = level || configService.getSync().wallet.settings.feeLevel || 'priority'; + self.setSendMax = function() { + + // Set Send max + if (self.currentFeeLevel && self.totalBytesToSendMax) { + feeService.getCurrentFeeValue(self.currentFeeLevel, function(err, feePerKb) { + + // KB to send max + if (self.totalBytesToSendMax) { + var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb ) / 1000.).toFixed(0)); + self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit); + self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName; + +console.log('[index.js.595]', self.currentFeeLevel, feePerKb, self.totalBytesToSendMax, feeToSendMaxSat, self.feeToSendMaxStr, "AVAIL", self.availableBalanceSat,self.availableMaxBalance); //TODO + + } else { + self.feeToSendMaxStr = null; + } + }); + } + }; - self.setFees = function() { + self.setCurrentFeeLevel = function(level) { + self.currentFeeLevel = level || configService.getSync().wallet.settings.feeLevel || 'priority'; + self.setSendMax(); + }; + + + self.setFeesOpts = function() { var fc = profileService.focusedClient; if (!fc) return; $timeout(function() { feeService.getFeeLevels(function(levels) { self.feeLevels = levels; - self.setCurrentFeeLevel(); $rootScope.$apply(); }); }); @@ -550,6 +573,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r var config = configService.getSync().wallet.settings; var COIN = 1e8; + // Address with Balance self.balanceByAddress = balance.byAddress; @@ -572,17 +596,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.lockedBalanceBTC = strip(self.lockedBalanceSat / COIN); self.availableBalanceBTC = strip(self.availableBalanceBTC / COIN); - // KB to send max - self.feePerKbSat = config.feeValue || 10000; - if (balance.totalKbToSendMax) { - var feeToSendMaxSat = balance.totalKbToSendMax * self.feePerKbSat; - - self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit); - self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName; - } else { - self.feeToSendMaxStr = null; - } - //STR self.totalBalanceStr = profileService.formatAmount(self.totalBalanceSat) + ' ' + self.unitName; self.lockedBalanceStr = profileService.formatAmount(self.lockedBalanceSat) + ' ' + self.unitName; @@ -591,6 +604,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.alternativeName = config.alternativeName; self.alternativeIsoCode = config.alternativeIsoCode; + // Other + self.totalBytesToSendMax = balance.totalBytesToSendMax; + + self.setCurrentFeeLevel(); + // Check address addressService.isUsed(self.walletId, balance.byAddress, function(err, used) { if (used) { diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index ec96ba394..ff1d59536 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -714,6 +714,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; }; + this.setFee = function(level) { + this.currentSendFeeLevel = level; + }; + this.submitForm = function() { var fc = profileService.focusedClient; var unitToSat = this.unitToSatoshi; @@ -748,6 +752,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) { if (err) $log.debug(err); +console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO fc.sendTxProposal({ toAddress: address, amount: amount, diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index 3b7f810ce..1924d0ac8 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -22,7 +22,7 @@ angular.module('copayApp.services').factory('feeService', function($log, profile } else { fee = lodash.find(levels, { level: feeLevel }).feePerKB; - $log.debug('Dynamic fee for ' + feeLevel + ': ' + fee); + $log.debug('Dynamic fee for:' + feeLevel + ': ' + fee + ' SAT'); return cb(null, fee); } }); From ba40323b7b1402392cfc84e50842e28cf9b476d9 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 11 Aug 2015 17:45:57 -0300 Subject: [PATCH 104/158] show pending update --- public/views/walletHome.html | 16 ++++-- src/js/controllers/index.js | 51 +++++++++-------- src/js/controllers/preferences.js | 3 +- src/js/services/balanceService.js | 92 ------------------------------- 4 files changed, 41 insertions(+), 121 deletions(-) delete mode 100644 src/js/services/balanceService.js diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 57f28cd22..02d459b87 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -91,6 +91,12 @@ ng-if="index.totalBalanceAlternative"> {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
    +
    + Pending Confirmation: + {{index.pendingAmountStr}} +
    +
    @@ -162,9 +168,9 @@
    + ng-show="index.lockedBalanceSat && !index.updatingStatus"> Total Locked Balance: - {{index.lockedBalance}} {{index.unitName}} + {{index.lockedBalanceStr}} {{index.lockedBalanceAlternative}} {{index.alternativeIsoCode}}
    @@ -288,12 +294,12 @@

    Send All -
    +
    Available Balance: @@ -301,7 +307,7 @@
    -
    +
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 6559dbd7f..0963c7a7d 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -89,17 +89,23 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (!fc) return; // Clean status - self.lockedBalance = null; + self.totalBalanceSat = null; + self.lockedBalanceSat = null; + self.availableBalanceSat = null; + + self.totalBalanceStr = null; self.availableBalanceStr = null; - self.totalBalanceStr = null; self.lockedBalanceStr = null; - self.totalBalanceStr = null; + self.alternativeBalanceAvailable = false; self.totalBalanceAlternative = null; + self.notAuthorized = false; self.txHistory = []; self.txHistoryPaging = false; self.pendingTxProposalsCountForUs = null; + self.setSpendUnconfirmed(); + $timeout(function() { self.hasProfile = true; self.noFocusedWallet = false; @@ -279,7 +285,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r $log.debug('Wallet Status:', walletStatus); self.setPendingTxps(walletStatus.pendingTxps); self.setFeesOpts(); - self.setSpendUnconfirmed(); // Status Shortcuts self.walletName = walletStatus.wallet.name; @@ -322,9 +327,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb ) / 1000.).toFixed(0)); self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit); self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName; - -console.log('[index.js.595]', self.currentFeeLevel, feePerKb, self.totalBytesToSendMax, feeToSendMaxSat, self.feeToSendMaxStr, "AVAIL", self.availableBalanceSat,self.availableMaxBalance); //TODO - } else { self.feeToSendMaxStr = null; } @@ -578,35 +580,39 @@ console.log('[index.js.595]', self.currentFeeLevel, feePerKb, self.totalBytesToS self.balanceByAddress = balance.byAddress; // SAT - self.totalBalanceSat = balance.totalAmount; - self.lockedBalanceSat = balance.lockedAmount; - self.availableBalanceSat = self.totalBalanceSat - self.lockedBalanceSat; + if (self.spendUnconfirmed) { + self.totalBalanceSat = balance.totalAmount; + self.lockedBalanceSat = balance.lockedAmount; + self.availableBalanceSat = balance.availableAmount; + self.pendingAmount = null; + } else { + self.totalBalanceSat = balance.totalConfirmedAmount; + self.lockedBalanceSat = balance.lockedConfirmedAmount; + self.availableBalanceSat = balance.availableConfirmedAmount; + self.pendingAmount = balance.totalAmount - balance.totalConfirmedAmount; + } // Selected unit self.unitToSatoshi = config.unitToSatoshi; self.satToUnit = 1 / self.unitToSatoshi; self.unitName = config.unitName; - self.totalBalance = strip(self.totalBalanceSat * self.satToUnit); - self.lockedBalance = strip(self.lockedBalanceSat * self.satToUnit); - self.availableBalance = strip(self.availableBalanceSat * self.satToUnit); - - // BTC - self.totalBalanceBTC = strip(self.totalBalanceSat / COIN); - self.lockedBalanceBTC = strip(self.lockedBalanceSat / COIN); - self.availableBalanceBTC = strip(self.availableBalanceBTC / COIN); - //STR self.totalBalanceStr = profileService.formatAmount(self.totalBalanceSat) + ' ' + self.unitName; self.lockedBalanceStr = profileService.formatAmount(self.lockedBalanceSat) + ' ' + self.unitName; self.availableBalanceStr = profileService.formatAmount(self.availableBalanceSat) + ' ' + self.unitName; + if (self.pendingAmount) { + self.pendingAmountStr = profileService.formatAmount(self.pendingAmount) + ' ' + self.unitName; + } else { + self.pendingAmountStr = null; + } + self.alternativeName = config.alternativeName; self.alternativeIsoCode = config.alternativeIsoCode; // Other self.totalBytesToSendMax = balance.totalBytesToSendMax; - self.setCurrentFeeLevel(); // Check address @@ -619,8 +625,8 @@ console.log('[index.js.595]', self.currentFeeLevel, feePerKb, self.totalBytesToS rateService.whenAvailable(function() { - var totalBalanceAlternative = rateService.toFiat(self.totalBalance * self.unitToSatoshi, self.alternativeIsoCode); - var lockedBalanceAlternative = rateService.toFiat(self.lockedBalance * self.unitToSatoshi, self.alternativeIsoCode); + var totalBalanceAlternative = rateService.toFiat(self.totalBalanceSat, self.alternativeIsoCode); + var lockedBalanceAlternative = rateService.toFiat(self.lockedBalanceSat, self.alternativeIsoCode); var alternativeConversionRate = rateService.toFiat(100000000, self.alternativeIsoCode); self.totalBalanceAlternative = $filter('noFractionNumber')(totalBalanceAlternative, 2); @@ -884,6 +890,7 @@ console.log('[index.js.595]', self.currentFeeLevel, feePerKb, self.totalBytesToS $rootScope.$on('Local/SpendUnconfirmedUpdated', function(event) { self.setSpendUnconfirmed(); + self.updateAll(); }); $rootScope.$on('Local/FeeLevelUpdated', function(event, level) { diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index c562785bb..468b74841 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -21,9 +21,8 @@ angular.module('copayApp.controllers').controller('preferencesController', spendUnconfirmed: newVal } }; - $rootScope.$emit('Local/SpendUnconfirmedUpdated'); - configService.set(opts, function(err) { + $rootScope.$emit('Local/SpendUnconfirmedUpdated'); if (err) $log.debug(err); }); }); diff --git a/src/js/services/balanceService.js b/src/js/services/balanceService.js deleted file mode 100644 index 432a2e10b..000000000 --- a/src/js/services/balanceService.js +++ /dev/null @@ -1,92 +0,0 @@ -'use strict'; - -angular.module('copayApp.services') - .factory('balanceService', function($rootScope, $filter, $timeout, bwcService) { - var root = {}; - var _balanceCache = {}; - root.clearBalanceCache = function(w) { - w.clearUnspentCache(); - delete _balanceCache[w.getId()]; - }; - - root._fetchBalance = function(w, cb) { - cb = cb || function() {}; - var satToUnit = 1 / w.settings.unitToSatoshi; - var COIN = bwcService.Bitcore.util.COIN; - w.getBalance(function(err, balanceSat, balanceByAddrSat, safeBalanceSat, safeUnspentCount) { - if (err) return cb(err); - - var r = {}; - r.totalBalance = $filter('noFractionNumber')(balanceSat * satToUnit); - r.totalBalanceBTC = (balanceSat / COIN); - var availableBalanceNr = safeBalanceSat * satToUnit; - r.availableBalance = $filter('noFractionNumber')(safeBalanceSat * satToUnit); - r.availableBalanceBTC = (safeBalanceSat / COIN); - r.safeUnspentCount = safeUnspentCount; - - var lockedBalance = (balanceSat - safeBalanceSat) * satToUnit; - r.lockedBalance = lockedBalance ? $filter('noFractionNumber')(lockedBalance) : null; - r.lockedBalanceBTC = (balanceSat - safeBalanceSat) / COIN; - - - if (r.safeUnspentCount) { - var estimatedFee = copay.Wallet.estimatedFee(r.safeUnspentCount); - r.topAmount = (((availableBalanceNr * w.settings.unitToSatoshi).toFixed(0) - estimatedFee) / w.settings.unitToSatoshi); - } - - var balanceByAddr = {}; - for (var ii in balanceByAddrSat) { - balanceByAddr[ii] = balanceByAddrSat[ii] * satToUnit; - } - r.balanceByAddr = balanceByAddr; - - r.totalBalanceAlternative = $filter('noFractionNumber')(totalBalanceAlternative, 2); - r.lockedBalanceAlternative = $filter('noFractionNumber')(lockedBalanceAlternative, 2); - r.alternativeConversionRate = $filter('noFractionNumber')(alternativeConversionRate, 2); - - r.alternativeBalanceAvailable = true; - r.alternativeIsoCode = w.settings.alternativeIsoCode; - - r.updatingBalance = false; - - return cb(null, r) - }); - }; - - root.update = function(w, cb, isFocused) { - w = w || $rootScope.wallet; - if (!w || !w.isComplete()) return; - - copay.logger.debug('Updating balance of:', w.getName(), isFocused); - var wid = w.getId(); - - - // cache available? Set the cached values until we updated them - if (_balanceCache[wid]) { - w.balanceInfo = _balanceCache[wid]; - } else { - if (isFocused) - $rootScope.updatingBalance = true; - } - - w.balanceInfo = w.balanceInfo || {}; - w.balanceInfo.updating = true; - - root._fetchBalance(w, function(err, res) { - if (err) throw err; - w.balanceInfo = _balanceCache[wid] = res; - w.balanceInfo.updating = false; - - if (isFocused) { - $rootScope.updatingBalance = false; - } - // we alwalys calltimeout because if balance is cached, we are still on the same - // execution path - if (cb) $timeout(function() { - return cb(); - }, 1); - }); - }; - - return root; - }); From 90bfe4aaa2391ff8f5cd8f32c3f1186b13c8d96b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 11 Aug 2015 17:59:41 -0300 Subject: [PATCH 105/158] Display if has unconfirmed inputs --- public/views/modals/txp-details.html | 4 ++-- src/js/controllers/walletHome.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 6460111a2..f1a47d9b4 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -30,9 +30,9 @@ Fee: {{feeStr}}

    • -
  • +
  • Uses unconfirmed funds: - {{(tx.excludeUnconfirmedUtxos ? 'No' : 'Yes')|translate}} + {{(tx.hasUnconfirmedInputs ? 'Yes' : 'No')|translate}}
  • Time: diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index ff1d59536..df7d089f9 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -184,6 +184,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.openTxpModal = function(tx, copayers) { var fc = profileService.focusedClient; var refreshUntilItChanges = false; + var currentSpendUnconfirmed = $scope.currentSpendUnconfirmed; var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.error = null; $scope.tx = tx; @@ -196,6 +197,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.loading = null; $scope.color = fc.backgroundColor; refreshUntilItChanges = false; + $scope.currentSpendUnconfirmed = currentSpendUnconfirmed; $scope.getShortNetworkName = function() { return fc.credentials.networkName.substring(0, 4); From 42cd5ba3e0a51dcfa420a66d8b92577533e37ac0 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 11 Aug 2015 18:55:47 -0300 Subject: [PATCH 106/158] Fixes unconfirmed message --- bower.json | 2 +- public/views/modals/txp-details.html | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 93266daf7..05df61448 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "ng-lodash": "~0.2.0", "angular-moment": "~0.10.1", "moment": "~2.10.3", - "angular-bitcore-wallet-client": "^0.1.1", + "angular-bitcore-wallet-client": "^0.1.2", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", "fastclick": "*", diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index f1a47d9b4..dc8c683bd 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -29,11 +29,7 @@
  • Fee: {{feeStr}} -
    • -
  • - Uses unconfirmed funds: - {{(tx.hasUnconfirmedInputs ? 'Yes' : 'No')|translate}} -
    • +
  • Time: @@ -45,6 +41,9 @@ {{tx.creatorName}}
    • +
    + Warning: this transaction has unconfirmed inputs +

    Payment details

      From 6747d5a02bace9cb713f20b4e676545bed4b57c3 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Wed, 12 Aug 2015 20:19:13 +0900 Subject: [PATCH 107/158] Update template.pot --- i18n/po/template.pot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 9b384c51c..d7cd8e5e1 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -805,6 +805,10 @@ msgstr "" msgid "Payment to" msgstr "" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "" From c87eb6014a31d1f700da353aac741fbce7e75a82 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Wed, 12 Aug 2015 20:20:40 +0900 Subject: [PATCH 108/158] Update appstore update info --- i18n/docs/updateinfo_en.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/i18n/docs/updateinfo_en.txt b/i18n/docs/updateinfo_en.txt index 6cc35687a..96fb0d7f4 100644 --- a/i18n/docs/updateinfo_en.txt +++ b/i18n/docs/updateinfo_en.txt @@ -1,7 +1,5 @@ -* Now is possible to make backups without signing capabilities (more info https://github.com/bitpay/copay/pull/2998) -* Better refresh and sorting rules in transaction history -* Better handling of `invalid` transactions in history -* Better handling of wallets with 1K+ transactions in history -* Exports .csv files with transaction ID -* Better UTXOs selection polices +* Improved fee handling and fee notifications +* Added advanced sending options +* Create transaction proposals with multiple destinations +* Added Italian and Greek language options * Minor bug fixes From fe07348a5a48781b803cfca064f7825502931386 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 08:57:44 -0300 Subject: [PATCH 109/158] adds errorCb, handles blocks --- src/js/controllers/create.js | 3 +++ src/js/controllers/index.js | 17 +++++++++++++++++ src/js/services/profileService.js | 19 +++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index c696d487b..8ac67f68a 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -63,6 +63,9 @@ angular.module('copayApp.controllers').controller('createController', if (err) { $log.debug(err); self.error = err; + $timeout(function() { + $rootScope.$apply(); + }); } else { go.walletHome(); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 0963c7a7d..50935294a 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -960,6 +960,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r trailing: true }); + self.debouncedUpdateHistory = lodash.throttle(function() { + self.updateTxHistory(); + }, 60000); $rootScope.$on('Local/Resume', function(event) { $log.debug('### Resume event'); @@ -1023,6 +1026,20 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }); + + $rootScope.$on('NewBlock', function() { + if (self.pendingAmount) { + self.updateAll(); + } + + if (self.network =='testnet') { + self.debouncedUpdateHistory(); + } else { + self.updateTxHistory(); + } + }); + + $rootScope.$on('NewOutgoingTx', function() { self.updateAll({ walletStatus: null, diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index e16408c45..bbb75921c 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -12,6 +12,21 @@ angular.module('copayApp.services') return bwcService.getUtils(); }; + root.errorCb = function(err, prefix, cb) { + var body = ''; + + prefix = gettext(prefix); + if (!err || !err.code) return cb(prefix); + + switch(err.code) { + case 'CONNECTION_ERROR': + body = gettext('Network connection error'); + ;; + } + + return cb(prefix + ( body ? ': ' + body : '')); + }; + root.formatAmount = function(amount) { var config = configService.getSync().wallet.settings; if (config.unitCode == 'sat') return amount; @@ -176,7 +191,7 @@ angular.module('copayApp.services') walletClient.createWallet('Personal Wallet', 'me', 1, 1, { network: 'livenet' }, function(err) { - if (err) return cb(gettext('Error creating wallet. Check your internet connection')); + if (err) return root.errorCb(err, 'Error creating wallet', cb); var p = Profile.create({ credentials: [JSON.parse(walletClient.export())], }); @@ -198,7 +213,7 @@ angular.module('copayApp.services') walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, { network: opts.networkName }, function(err, secret) { - if (err) return cb(gettext('Error creating wallet')); + if (err) return root.errorCb(err, 'Error creating wallet', cb); root.profile.credentials.push(JSON.parse(walletClient.export())); root.setWalletClients(); From 033f7c163fcd6d47d898adbb3644170195088ea2 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 11:08:33 -0300 Subject: [PATCH 110/158] better handing of errors + prevent joining the same wallet more that once --- public/views/walletHome.html | 2 +- src/js/controllers/index.js | 4 +- src/js/controllers/join.js | 2 +- src/js/controllers/walletHome.js | 73 +++++------------ src/js/services/addressService.js | 5 +- src/js/services/bwsError.js | 125 ++++++++++++++++++++++++++++++ src/js/services/profileService.js | 35 ++++----- 7 files changed, 167 insertions(+), 79 deletions(-) create mode 100644 src/js/services/bwsError.js diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 02d459b87..12d3bcba6 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -76,7 +76,7 @@
      - Could not update Wallet + {{index.updateError}}
      diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 50935294a..00a6c50d7 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -243,7 +243,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateError = false; return fc.getStatus(function(err, ret) { if (err) { - self.updateError = true; + self.updateError = bwsError.msg(err, 'Could not update Wallet'); } else { if (!opts.quiet) self.setOngoingProcess('scanning', ret.wallet.scanning); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 948cfe176..1ca442f8c 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -153,7 +153,7 @@ angular.module('copayApp.controllers').controller('joinController', }, function(err) { if (err) { self.loading = false; - self.error = gettext('Could not join wallet: ') + (err.message ? err.message : err); + self.error = err; $rootScope.$apply(); return } diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index ff1d59536..9b19db9c2 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, feeService) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, feeService, bwsError) { var self = this; $rootScope.hideMenuBar = false; @@ -94,24 +94,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var cancel_msg = gettextCatalog.getString('Cancel'); var confirm_msg = gettextCatalog.getString('Confirm'); - // walletHome - - - var parseError = function(err) { - if (!err) return; - - if (err.message) { - // TODO : this is not used anymore? - if (err.message.indexOf('CORS') >= 0) { - err.message = gettext('Could not connect wallet service. Check your Internet connection and your wallet service configuration.'); - } - - if (err.message.indexOf('TIMEDOUT') >= 0) { - err.message = gettext('Wallet service timed out. Check your Internet connection and your wallet service configuration.'); - } - } - }; - $scope.openCopayersModal = function(copayers, copayerId) { var fc = profileService.focusedClient; @@ -152,13 +134,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); addressService.getAddress(walletId, false, function(err, addr) { $scope.gettingAddress = false; - if (!err || addr) - $modalInstance.close(addr); - else { - parseError(err); + + if (err) { self.error = err; $modalInstance.dismiss('cancel'); + return; } + + $modalInstance.close(addr); }); }; }; @@ -247,8 +230,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (fc.isPrivKeyEncrypted()) { profileService.unlockFC(function(err) { if (err) { - parseError(err); - $scope.error = err; + $scope.error = bwsError.msg(err); return; } return $scope.sign(txp); @@ -265,8 +247,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); if (err) { $scope.loading = false; - parseError(err); - $scope.error = err.message || gettext('Could not accept payment. Check your Internet connection and try again'); + $scope.error = bwsError.msg(err, gettext('Could not accept payment')); $scope.$digest(); } else { //if txp has required signatures then broadcast it @@ -278,8 +259,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - parseError(err); - $scope.error = gettext('Could not broadcast payment. Check your Internet connection and try again'); + $scope.error = bwsError.msg('Could not broadcast payment'); $scope.$digest(); } else { $log.debug('Transaction signed and broadcasted') @@ -308,8 +288,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - parseError(err); - $scope.error = err.message || gettext('Could not reject payment. Check your Internet connection and try again'); + $scope.error = bwsError.msg(err,gettext('Could not reject payment')); $scope.$digest(); } else { $modalInstance.close(txpr); @@ -330,8 +309,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi // Hacky: request tries to parse an empty response if (err && !(err.message && err.message.match(/Unexpected/))) { - parseError(err); - $scope.error = err.message || gettext('Could not delete payment proposal. Check your Internet connection and try again'); + $scope.error = bwsError.msg(err, gettext('Could not delete payment proposal')); $scope.$digest(); return; } @@ -349,8 +327,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - parseError(err); - $scope.error = err.message || gettext('Could not broadcast payment. Check your Internet connection and try again'); + $scope.error = bwsError.msg(gettext('Could not broadcast payment')); $scope.$digest(); } else { @@ -420,14 +397,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi addressService.getAddress(fc.credentials.walletId, forceNew, function(err, addr) { self.generatingAddress = false; - if (err) { - parseError(err); - self.addrError = err.message || gettext('Could not create address. Check your Internet connection and try again'); + if (err) { + self.addrError = err; + } else { + if (addr) + self.addr[fc.credentials.walletId] = addr; } - if (addr) - self.addr[fc.credentials.walletId] = addr; - $scope.$digest(); }); }); @@ -678,16 +654,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.setSendError = function(err) { var fc = profileService.focusedClient; - $log.warn(err); - parseError(err); - var errMessage = + var prefix = fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); - //This are abnormal situations, but still err message will not be translated - //(the should) we should switch using err.code and use proper gettext messages - errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check your Internet connection and try again')); - - this.error = errMessage; + this.error = bwsError.msg(err, prefix); $timeout(function() { $scope.$digest(); @@ -802,8 +772,7 @@ console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO profileService.lockFC(); self.setOngoingProcess(); if (err) { - $log.debug('Sign error:', err); - err.message = gettext('The payment was created but could not be signed. Please try again from home screen.') + (err.message ? ' ' + err.message : ''); + err.message = bwsError.msg(err, gettext('The payment was created but could not be signed. Please try again from home screen')); return cb(err); } @@ -812,7 +781,7 @@ console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO fc.broadcastTxProposal(signedTx, function(err, btx, memo) { self.setOngoingProcess(); if (err) { - err.message = gettext('The payment was signed but could not be broadcasted. Please try again from home screen.') + (err.message ? ' ' + err.message : ''); + err.message = bwsError.msg(err, gettext('The payment was signed but could not be broadcasted. Please try again from home screen')); return cb(err); } if (memo) diff --git a/src/js/services/addressService.js b/src/js/services/addressService.js index 39978f94a..b0432d00a 100644 --- a/src/js/services/addressService.js +++ b/src/js/services/addressService.js @@ -1,7 +1,7 @@ 'use strict'; 'use strict'; angular.module('copayApp.services') - .factory('addressService', function(storageService, profileService, $log, $timeout, lodash) { + .factory('addressService', function(storageService, profileService, $log, $timeout, lodash, bwsError, gettext) { var root = {}; @@ -34,8 +34,7 @@ angular.module('copayApp.services') root._createAddress(walletId, cb); }, 5000); } - $log.debug('Creating address ERROR:', err); - return cb(err); + return bwsError.cb(err, gettext('Could not create address'), cb); } return cb(null, addr.address); }); diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js new file mode 100644 index 000000000..a8e513f18 --- /dev/null +++ b/src/js/services/bwsError.js @@ -0,0 +1,125 @@ +'use strict'; +angular.module('copayApp.services') + .factory('bwsError', function bwcErrorService($log, gettext) { + var root = {}; + + root.msg = function(err, prefix) { + var body = ''; + prefix = prefix || ''; + + if (err && err.code) { + switch(err.code) { + case 'CONNECTION_ERROR': + body = gettext('Network connection error'); + break; + ;; + case 'NOT_FOUND': + body = gettext('Wallet service not found'); + break; + ;; + case 'BAD_SIGNATURES': + body = gettext('Signatures rejected by server'); + break; + ;; + case 'COPAYER_DATA_MISMATCH': + body = gettext('Copayer data mismatch'); + break; + ;; + case 'COPAYER_IN_WALLET': + body = gettext('Copayer already in this wallet'); + break; + ;; + case 'COPAYER_REGISTERED': + body = gettext('Copayer already registered'); + break; + ;; + case 'COPAYER_VOTED': + body = gettext('Copayer already voted on this spend proposal'); + break; + ;; + case 'DUST_AMOUNT': + body = gettext('Amount below dust threshold'); + break; + ;; + case 'INCORRECT_ADDRESS_NETWORK': + body = gettext('Incorrect address network'); + break; + ;; + case 'INSUFFICIENT_FUNDS': + body = gettext('Insufficient funds'); + break; + ;; + case 'INSUFFICIENT_FUNDS_FOR_FEE': + body = gettext('Insufficient funds for fee'); + break; + ;; + case 'INVALID_ADDRESS': + body = gettext('Invalid address'); + break; + ;; + case 'LOCKED_FUNDS': + body = gettext('Funds are locked by pending spend proposals'); + break; + ;; + case 'NOT_AUTHORIZED': + body = gettext('Not authorized'); + break; + ;; + case 'TX_ALREADY_BROADCASTED': + body = gettext('Transaction already broadcasted'); + break; + ;; + case 'TX_CANNOT_CREATE': + body = gettext('Locktime in effect. Please wait to create a new spend proposal'); + break; + ;; + case 'TX_CANNOT_REMOVE': + body = gettext('Locktime in effect. Please wait to remove this spend proposal'); + break; + ;; + case 'TX_NOT_ACCEPTED': + body = gettext('Spend proposal is not accepted'); + break; + ;; + case 'TX_NOT_FOUND': + body = gettext('Spend proposal not found'); + break; + ;; + case 'TX_NOT_PENDING': + body = gettext('The spend proposal is not pending'); + break; + ;; + case 'UPGRADE_NEEDED': + body = gettext('Please upgrade Copay to perform this action'); + break; + ;; + case 'WALLET_ALREADY_EXISTS': + body = gettext('Wallet already exists'); + break; + ;; + case 'WALLET_FULL': + body = gettext('Wallet is full'); + break; + ;; + case 'WALLET_NOT_COMPLETE': + body = gettext('Wallet is not complete'); + break; + ;; + case 'WALLET_NOT_FOUND': + body = gettext('Wallet not found'); + break; + ;; + } + } + + var msg = prefix + ( body ? ': ' + body : ''); + $log.warn("BWC ERROR:" + msg); + return msg; + }; + + root.cb = function (err,prefix, cb) { + return cb(root.msg(err, prefix)) + }; + + return root; + }); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index bbb75921c..3d9c03373 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('copayApp.services') - .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit) { + .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError) { var root = {}; @@ -11,22 +11,6 @@ angular.module('copayApp.services') root.getUtils = function() { return bwcService.getUtils(); }; - - root.errorCb = function(err, prefix, cb) { - var body = ''; - - prefix = gettext(prefix); - if (!err || !err.code) return cb(prefix); - - switch(err.code) { - case 'CONNECTION_ERROR': - body = gettext('Network connection error'); - ;; - } - - return cb(prefix + ( body ? ': ' + body : '')); - }; - root.formatAmount = function(amount) { var config = configService.getSync().wallet.settings; if (config.unitCode == 'sat') return amount; @@ -191,7 +175,7 @@ angular.module('copayApp.services') walletClient.createWallet('Personal Wallet', 'me', 1, 1, { network: 'livenet' }, function(err) { - if (err) return root.errorCb(err, 'Error creating wallet', cb); + if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb); var p = Profile.create({ credentials: [JSON.parse(walletClient.export())], }); @@ -213,7 +197,7 @@ angular.module('copayApp.services') walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, { network: opts.networkName }, function(err, secret) { - if (err) return root.errorCb(err, 'Error creating wallet', cb); + if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb); root.profile.credentials.push(JSON.parse(walletClient.export())); root.setWalletClients(); @@ -236,8 +220,19 @@ angular.module('copayApp.services') return cb(gettext('Could not join using the specified extended private key')); } } + + + try { + var walletData = this.getUtils().fromSecret(opts.secret); + if (root.walletClients[walletData.walletId]) + return cb(gettext('Cannot join the same wallet more that once')); + + } catch (ex) { + return cb(gettext('Bad wallet invitation')); + } + walletClient.joinWallet(opts.secret, opts.myName || 'me', function(err) { - if (err) return cb(err); + if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb); root.profile.credentials.push(JSON.parse(walletClient.export())); root.setWalletClients(); From 7c65b9907fec706d7c75b8582389e03bf7184290 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 11:16:34 -0300 Subject: [PATCH 111/158] better find code --- src/js/services/profileService.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 3d9c03373..d3bb65c1f 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -224,9 +224,13 @@ angular.module('copayApp.services') try { var walletData = this.getUtils().fromSecret(opts.secret); - if (root.walletClients[walletData.walletId]) - return cb(gettext('Cannot join the same wallet more that once')); + // check if exist + if (lodash.find(root.profile.credentials, { + 'walletId': walletData.walletId + })) { + return cb(gettext('Cannot join the same wallet more that once')); + } } catch (ex) { return cb(gettext('Bad wallet invitation')); } From 8231271bc63e148dc5dd511d73e72f57194e8c79 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 12 Aug 2015 11:18:03 -0300 Subject: [PATCH 112/158] New language: Russian --- i18n/po/ru.po | 1312 +++++++++++++++++++++++++++++++++ public/views/translators.html | 1 + src/js/controllers/index.js | 3 + 3 files changed, 1316 insertions(+) create mode 100644 i18n/po/ru.po diff --git a/i18n/po/ru.po b/i18n/po/ru.po new file mode 100644 index 000000000..84d411ed4 --- /dev/null +++ b/i18n/po/ru.po @@ -0,0 +1,1312 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: copay\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: ru\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83\n" +"Language-Team: Russian\n" +"Language: ru\n" +"PO-Revision-Date: 2015-08-12 06:59-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(возможна двойная трата)" + +#: public/views/modals/txp-details.html +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr "* Предложение платежа может быть удалено если 1) вы создали предложение, и никто его еще не подписал, или 2) прошло более 24 часов с момента создания предложения." + +#: public/views/backup.html +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* Вы можете безопасно восстановить свой бэкап на другом устройстве и использовать ваш кошелек с нескольких устройств одновременно." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "Бэкап без закрытого ключа позволит пользователю видеть баланс кошелька, транзакции, и создавать предложения платежей. Однако будет невозможно одобрить (подписать) предложения." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "Bitcoin-кошелёк с мультиподписью" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "О Copay" + +#: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Accept" +msgstr "Принять" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "Добавить кошелёк" + +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +msgid "Address" +msgstr "Адрес" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "Подробнее" + +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Расширенные настройки платежа" + +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Соглашаюсь" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Псевдоним для {{index.walletName}}" + +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "Любой вклад в перевод Copay приветствуются. Регистрируйтесь на crowdin.com и присоединяйтесь к проекту Copay на" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Уже есть кошелек?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "Альтернативная валюта" + +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/customized-amount.html +msgid "Amount" +msgstr "Сумма" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Amount in" +msgstr "Сумма в" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "Применение изменений" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "Вы уверены, что хотите удалить этот кошелек?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "Доступный баланс" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Среднее время подтверждения: {{fee.nbBlocks * 10}} минут" + +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32-мастер расширенного закрытого ключа" + +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "Назад" + +#: public/views/preferences.html +msgid "Backup" +msgstr "Резервное копирование" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Резервная копия создана" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "Создать резервную копию" + +#: public/views/backup.html +msgid "Backup options" +msgstr "Параметры резервной копии" + +#: public/views/walletHome.html +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "До получения средств, настоятельно рекомендуется, чтобы вы сделали резервную копию ключей кошелька." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Политика комиссии в сети Bitcoin" + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "Bitcoin URI не действителен!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "Адрес bitcoin" + +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Биткойн-транзакции могут включать комиссию, собираемую майнерами в сети. Чем выше комиссия, тем больше стимул для майнера включить транзакцию в блок. Фактическая комиссия определяется на основе сетевой нагрузки и выбранной политики." + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Отправить платёж" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Отправление платежа" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Создание транзакции" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "Браузер не поддерживается" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "Не отправлено. Попробуйте отправить вручную" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "ОТМЕНА" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Cancel" +msgstr "Отмена" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Сертифицирован" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "Изменение псевдонима кошелька влияет только на название локального кошелька." + +#: src/js/controllers/walletHome.js +msgid "Check your Internet connection and try again" +msgstr "Check your Internet connection and try again" + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "Выберите файл резервной копии с вашего компьютера" + +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Выберите кошелёк для отправки средств" + +#: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Close" +msgstr "Закрыть" + +#: public/views/preferences.html +msgid "Color" +msgstr "Цвет" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Хэш версии" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Подтвердить" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "Подтверждения" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Совладельцы кошелька" + +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Скопировано в буфер обмена" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "Сохраните резервную копию в надежном месте" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "Скопируйте этот текст как есть (в блокнот или отправьте по электронной почте)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "Скопировать в буфер обмена" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment. Check your Internet connection and try again" +msgstr "Could not accept payment. Check your Internet connection and try again" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment. Check your Internet connection and try again" +msgstr "Could not broadcast payment. Check your Internet connection and try again" + +#: src/js/controllers/walletHome.js +msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." +msgstr "Не удалось подключиться к службе кошелька. Проверьте своё Интернет-подключение и конфигурацию службы кошелька." + +#: src/js/controllers/walletHome.js +msgid "Could not create address. Check your Internet connection and try again" +msgstr "Could not create address. Check your Internet connection and try again" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Не удалось создать предложение платежа" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Не удалось создать используя указанный расширенный закрытый ключ" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Не удалось расшифровать файл, проверьте ваш пароль" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgstr "Could not delete payment proposal. Check your Internet connection and try again" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Не удалось получить информацию о платеже" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "Не удалось получить историю транзакций" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "Не удалось импортировать. Проверьте входной файл и пароль" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "Не удалось присоединиться используя указанный расширенный закрытый ключ" + +#: src/js/controllers/join.js +msgid "Could not join wallet:" +msgstr "Не удалось присоединиться к кошельку:" + +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Не удалось распознать действительный Bitcoin QR-код" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment. Check your Internet connection and try again" +msgstr "Could not reject payment. Check your Internet connection and try again" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Не удалось отправить платёж" + +#: public/views/walletHome.html +msgid "Could not update Wallet" +msgstr "Не удалось обновить кошелёк" + +#: public/views/walletHome.html +msgid "Create" +msgstr "Создать" + +#: public/views/add.html +#: public/views/create.html +msgid "Create new wallet" +msgstr "Создать новый кошелёк" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Создать кошелёк {{requiredCopayers}}-из-{{totalCopayers}}" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "Создать, присоединиться или импортировать" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "Создан" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Создание профиля..." + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "Создание кошелька..." + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Создание транзакции" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Текущая ставка комиссии для этой политики: {{fee.feePerKBUnit}}/kiB" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "Дата" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Удалить предложение платежа" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "Удалить кошелёк" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Удалите и создайте заново" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Удалить кошелёк" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Удаление платежа" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Подробности" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Выключено" + +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Не включать в резервную копию закрытый ключ" + +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Не видите свой язык на Crowdin? Свяжитесь с владельцем по Crowdin! Мы с удовольствием поддержим ваш язык." + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Скачать CSV-файл" + +#: public/views/backup.html +msgid "Download backup" +msgstr "Скачать резервную копию" + +#: src/js/services/feeService.js +msgid "Economy" +msgstr "Экономичный" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Email-уведомления" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "Зашифровать закрытый ключ" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Зашифрованный файл резервной копии сохранен" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "Введите свой пароль" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "Ошибка создания кошелька" + +#: src/js/services/profileService.js +msgid "Error creating wallet. Check your internet connection" +msgstr "Ошибка создания кошелька. Проверьте своё Интернет-подключение" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "Ошибка импорта кошелька:" + +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html +msgid "Expires" +msgstr "Срок действия" + +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Не удалось создать резервную копию" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Не удалось импортировать кошельки" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "Средства на семейный отпуск" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Комиссия" + +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Политика комиссии" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Извлечение информации платежа" + +#: public/views/translators.html +msgid "French" +msgstr "французский" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Принят платёж" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "НАЧАТЬ" + +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Сгенерировать QR-код" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "Создать новый адрес" + +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Создание .сsv-файла..." + +#: public/views/translators.html +msgid "German" +msgstr "немецкий" + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Получение адреса для кошелька {{selectedWalletName}}..." + +#: public/views/preferences.html +msgid "Global settings" +msgstr "Глобальные настройки" + +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Вернуться" + +#: public/views/translators.html +msgid "Greek" +msgstr "греческий" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Есть резервная копия из Copay v0.9?" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" + +#: src/js/controllers/index.js +msgid "History" +msgstr "История" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Главная" + +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "Я подтверждаю, что я прочитал(а), понял(а) и согласен(а) с настоящими условиями." + +#: public/views/create.html +#: public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "Если не указан, безопасный ключ будет создан" + +#: public/views/importLegacy.html +msgid "Import" +msgstr "Импорт" + +#: public/views/import.html +#: public/views/splash.html +msgid "Import backup" +msgstr "Импорт резервной копии" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "Импортировать из облака?" + +#: public/views/import.html +msgid "Import here" +msgstr "Импортировать сюда" + +#: public/views/add.html +msgid "Import wallet" +msgstr "Импорт кошелька" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "Импорт кошелька..." + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "Импорт..." + +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Недействительно" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Приглашение присоединиться к кошельку Copay" + +#: public/views/translators.html +msgid "Italian" +msgstr "итальянский" + +#: public/views/translators.html +msgid "Japanese" +msgstr "японский" + +#: public/views/create.html +#: public/views/join.html +msgid "John" +msgstr "John" + +#: public/views/join.html +msgid "Join" +msgstr "Присоединиться" + +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Присоединяйтесь к моему кошельку Copay. Вот код приглашения: {{secret}} Вы можете скачать Copay для своего телефона или настольного компьютера на https://copay.io" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "Присоединиться к общему кошельку" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "Присоединение к кошельку..." + +#: public/views/preferences.html +msgid "Language" +msgstr "Язык" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "Узнайте больше о переносе кошелька" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Сделать платёж" + +#: public/views/create.html +#: public/views/join.html +msgid "Master extended private key" +msgstr "Мастер расширенного закрытого ключа" + +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Me" +msgstr "Я" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Памятка" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Сообщение от продавца" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "Сообщение" + +#: public/views/walletHome.html +msgid "More" +msgstr "Подробнее" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Перемещено" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "Кошелёк с мультиподписью" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "Мой адрес Bitcoin" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "Сеть" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "Новое предложение платежа" + +#: public/views/walletHome.html +msgid "No Private key" +msgstr "Нет закрытого ключа" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "Транзакций пока не было" + +#: src/js/services/feeService.js +msgid "Normal" +msgstr "Обычный" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Not valid" +msgstr "Не действительно" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/tx-details.html +msgid "Note" +msgstr "Примечание" + +#: public/views/includes/password.html +msgid "OK" +msgstr "Хорошо" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "ХОРОШО" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "Участники" + +#: public/views/import.html +#: public/views/importLegacy.html +msgid "Password" +msgstr "Пароль" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "Пароль не может быть восстановлен. Обязательно запишите его" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "Нужен пароль" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "Пароли не совпадают" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Вставьте приглашение сюда" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Вставьте код резервной копии обычным текстом" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Отправить платёж" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Платёж принят" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Предложение платежа" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Создано предложение платежа" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Предложение платежа отклонено" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Предложение платежа отклонено совладельцем кошелька" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Предложение платежа подписано совладельцем кошелька" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Предложение платежа" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Платёжный протокол не поддерживается в приложении Chrome" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Платёж отклонён" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Платёж отправлен" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Платёж принят..." + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Детали платежа" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Платёж окончательно отклонён" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Запрос платежа" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Платёж отправлен!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Платёж" + +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "Окончательно удалить этот кошелёк. ЭТО ДЕЙСТВИЕ НЕ МОЖЕТ БЫТЬ ОТМЕНЕНО" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Личный кошелёк" + +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Пожалуйста, заполните необходимые поля" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Пожалуйста, выберите ваш файл резервной копии" + +#: public/views/translators.html +msgid "Portuguese" +msgstr "португальский" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Предпочтения" + +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Подготовка резервной копии..." + +#: src/js/services/feeService.js +msgid "Priority" +msgstr "Приоритетный" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "QR-код" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR-сканер" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Получить" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Получен" + +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Получатели" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Повторное подключение к службе кошелька..." + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Создать заново" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Воссоздаю кошелёк..." + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "Отклонить" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Отклонение платежа" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Расскрыть информацию" + +#: public/views/backup.html +#: public/views/includes/password.html +msgid "Repeat password" +msgstr "Повторите пароль" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Запросить определенную сумму" + +#: public/views/import.html +#: public/views/join.html +msgid "Required" +msgstr "Необходимо" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "Повторная попытка..." + +#: public/views/includes/password.html +msgid "SET" +msgstr "УСТАНОВИТЬ" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "ПРОПУСТИТЬ РЕЗЕРВНОЕ КОПИРОВАНИЕ" + +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Сохранить" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Сохранение настроек..." + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Сканирование завершено" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Сканировать адреса для средств" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "Сканирование завершено с ошибкой" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Сканирование средств кошелька..." + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "Посмотреть на blockchain" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "Выберите файл резервной копии" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Выберите кошелёк" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Выберите необходимое количество подписей" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Выберите общее количество совладельцев кошелька" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Отправить" + +#: public/views/walletHome.html +msgid "Send All" +msgstr "Отправить все" + +#: public/views/backup.html +#: public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Отправить по email" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Отправлено" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "Сервер" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Журнал сеанса" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "Выберите пароль для вашей резервной копии" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "Выберите пароль" + +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Включение email-уведомлений может ослабить вашу конфиденциальность, если поставщик услуг кошелька будет скомпрометирован. Информация доступная злоумышленнику будет включать адреса вашего кошелька и его баланс, но больше ничего." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Отправить адрес" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Отправить приглашение" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Отправьте приглашение совладельцам кошелька" + +#: public/views/walletHome.html +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Поделитесь этим адресом кошелька получения платежей. Для защиты вашей конфиденциальности, новые адреса создаются автоматически как только вы их использовали." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Общий бумажник" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Подписание платежа" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Подписание транзакции" + +#: public/views/translators.html +msgid "Spanish" +msgstr "испанский" + +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Успешно" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Нажмите для повторения" + +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Условия использования" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be completed. Please try again from home screen" +msgstr "Платёж был создан, но не может быть завершен. Пожалуйста, попробуйте снова с главной страницы" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen." +msgstr "Платёж был создан, но не может быть подписан. Пожалуйста, попробуйте снова с главной страницы." + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "Платёж был удалён его создателем" + +#: src/js/controllers/walletHome.js +msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgstr "Платёж был подписан, но не может быть отправлен. Пожалуйста, попробуйте снова с главной страницы." + +#: public/views/backup.html +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "Закрытый ключ для этого кошелька зашифрован. Экспорт резервной копии будет содержать закрытый ключ в зашифрованном виде в архиве резервой копии." + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "Программное обеспечение, которое вы собираетесь использовать, функционирует как цифровой кошелёк - бесплатный, с открытым исходным кодом и мультиподписью. Программное обеспечение не является счетом, где BitPay или других третьих сторон выступают в качестве финансовых посредников или хранителей ваших биткойнов. Хотя программное обеспечение прошло бета-тестирования и продолжает улучшаться путем обратной связи с пользователями открытого исходного кода и сообществом разработчиков, мы не можем гарантировать, что не будет никаких ошибок в программном обеспечении. Вы признаете, что используете это программное обеспечение по вашему собственному усмотрению и в соответствии со всеми применимыми законами. Вы ответственны за хранение ваших паролей, пары закрытых ключей, ПИН-кодов и любых других кодов, которые вы используете для доступа к программному обеспечению. ЕСЛИ ВЫ ПОТЕРЯЕТЕ ДОСТУП К ВАШЕМУ КОШЕЛЬКУ COPAY ИЛИ ВАШИМ ЗАШИФРОВАННЫМ ЗАКРЫТЫМ КЛЮЧАМ, И У ВАС НЕ ХРАНИЛАСЬ ОТДЕЛЬНО РЕЗЕРВНАЯ КОПИЯ ВАШЕГО БУМАЖНИКА И СООТВЕТСТВУЮЩИЙ ПАРОЛЬ, ВЫ ПРИЗНАЕТЕ И СОГЛАШАЕТЕСЬ, ЧТО ЛЮБЫЕ БИТКОЙНЫ, КОТОРЫЕ СВЯЗАННЫ С ЭТИМ КОШЕЛЬКОМ COPAY СТАНУТ НЕДОСТУПНЫМИ. Все транзакции являются необратимыми. Авторы программного обеспечения, работников и связанные лица Bitpay, владельцы авторских прав и BitPay, Inc. не могут восстановить ваши закрытые ключи или пароли, если вы потеряете или забудете их и не могут гарантировать подтверждение транзакций, поскольку они не имеют контроля над сетью Bitcoin. В максимальной степени, разрешенной законом это программное обеспечение предоставляется «как есть», и никаких заверений или гарантий не может быть дано - любого рода, явных или подразумеваемых, включая, но не ограничиваясь гарантии товарности, пригодности или конкретной цели и ненарушения. Вы принимаете на себя любые и все виды рисков, связанные с использованием программного обеспечения. Ни при каком случае авторы программного обеспечения, работников и связанные лица Bitpay, владельцы авторских прав, или BitPay, Inc. не несут ответственности за любые претензии, убытки или иной ответственности, будь то в действие контракта, правонарушения, или иным образом, проистекающей из, вне или в связи с программным обеспечением. Мы оставляем за собой право время от времени изменять этот отказ." + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "Кошелёк «{{walletName}}» был удален" + +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "Нет кошельков, чтобы осуществить этот платёж" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "В форме ошибка" + +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "Эта транзакция стала недействительной; возможно из-за попытки двойной траты." + +#: public/views/walletHome.html +msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." +msgstr "Это кошелёк не зарегистрирован в данной службе кошелька Bitcore (BWS). Вы можете воссоздать его из локальной информации." + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "Время" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "To" +msgstr "Кому" + +#: public/views/includes/output.html +msgid "Total" +msgstr "Итого" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Всего заблокировано средств" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Транзакция" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Благодарность за перевод" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Переводчики" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Не удается отправить предложение транзакции" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Неподтверждено" + +#: public/views/preferences.html +msgid "Unit" +msgstr "Единица измерения" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Неотправленные транзакции" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Ненадежно" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Обновление кошелька..." + +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + +#: public/views/modals/txp-details.html +msgid "Uses unconfirmed funds" +msgstr "Uses unconfirmed funds" + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Версия" + +#: public/views/backup.html +msgid "View backup" +msgstr "Просмотр резервной копии" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Необходимо резервное копирование" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Кошелёк не зарегистрирован" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "ДОБРО ПОЖАЛОВАТЬ В COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "Ожидание совладельцев кошелька" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "Ожидание..." + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Псевдоним кошелька" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "Кошелек уже импортирован:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "Приглашение присоединиться к кошельку" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "Приглашение присоединиться к кошельку не действительно!" + +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "Кошелёк уже существует" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Сбой: кошелёк не работает" + +#: public/views/create.html +msgid "Wallet name" +msgstr "Имя кошелька" + +#: src/js/controllers/walletHome.js +msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +msgstr "Истекло время ожидания службы кошелька. Проверьте своё Интернет-подключение и конфигурацию службы кошелька." + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "Предупреждение!" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "Неверный пароль" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Да" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "У вас нет кошелька" + +#: public/views/backup.html +#: public/views/import.html +msgid "Your backup password" +msgstr "Ваш пароль резервной копии" + +#: public/views/create.html +#: public/views/join.html +msgid "Your nickname" +msgstr "Ваше имя" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "Ваш пароль" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "Пароль вашего профиля" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Ваш кошелёк был импортирован правильно" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "адрес email для уведомлений кошелька" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "заблокировано в ожидании платежей" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/includes/sidebar.html +msgid "of" +msgstr "из" + +#: public/views/walletHome.html +msgid "optional" +msgstr "необязательно" + +#: public/views/preferences.html +msgid "settings" +msgstr "настройки" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "слишком долго!" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} будет снижена до уровня комиссий сети" + +#: src/js/controllers/importLegacy.js +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} кошельки импортированы. Идёт сканирование средств. Дождитесь обновлённого баланса" + diff --git a/public/views/translators.html b/public/views/translators.html index 535d0d9e6..39187d299 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -21,6 +21,7 @@
    • johnblazakisGreek
    • chek2fire1Greek
    • cmgustavo83Spanish
      • +
    • lax5Russian
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 0963c7a7d..c1f993e2d 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -62,6 +62,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r }, { name: '日本語', isoCode: 'ja', + }, { + name: 'Pусский', + isoCode: 'ru', }]; self.feeOpts = feeService.feeOpts; From ead4c403d4e29a69afdac19ca273ff6b7df605bd Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 11:39:55 -0300 Subject: [PATCH 113/158] rm translate --- public/views/walletHome.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 12d3bcba6..14a38b4da 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -76,7 +76,7 @@
    - {{index.updateError}} + {{index.updateError}}
    From d61206d2c09970f251f674a62aa7aee62fa40e61 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 11:49:13 -0300 Subject: [PATCH 114/158] fix parameters --- src/js/controllers/walletHome.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 9b19db9c2..24507e51c 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -175,7 +175,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers $scope.copayerId = fc.credentials.copayerId; - $scope.canSign= fc.canSign(); + $scope.canSign = fc.canSign(); $scope.loading = null; $scope.color = fc.backgroundColor; refreshUntilItChanges = false; @@ -259,7 +259,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = bwsError.msg('Could not broadcast payment'); + $scope.error = bwsError.msg(err, gettext('Could not broadcast payment')); $scope.$digest(); } else { $log.debug('Transaction signed and broadcasted') @@ -288,7 +288,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = bwsError.msg(err,gettext('Could not reject payment')); + $scope.error = bwsError.msg(err, gettext('Could not reject payment')); $scope.$digest(); } else { $modalInstance.close(txpr); @@ -327,7 +327,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = bwsError.msg(gettext('Could not broadcast payment')); + $scope.error = bwsError.msg(err, gettext('Could not broadcast payment')); $scope.$digest(); } else { @@ -397,9 +397,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi addressService.getAddress(fc.credentials.walletId, forceNew, function(err, addr) { self.generatingAddress = false; - if (err) { + if (err) { self.addrError = err; - } else { + } else { if (addr) self.addr[fc.credentials.walletId] = addr; } @@ -657,7 +657,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var prefix = fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); - this.error = bwsError.msg(err, prefix); + this.error = bwsError.msg(err, prefix); $timeout(function() { $scope.$digest(); @@ -691,7 +691,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.submitForm = function() { var fc = profileService.focusedClient; var unitToSat = this.unitToSatoshi; - + if (isCordova && this.isWindowsPhoneApp) { this.hideAddress = false; this.hideAmount = false; @@ -722,7 +722,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) { if (err) $log.debug(err); -console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO + console.log('[walletHome.js.757:amount:]', amount, feePerKb); //TODO fc.sendTxProposal({ toAddress: address, amount: amount, @@ -1046,7 +1046,7 @@ console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO }; this.confirmDialog = function(msg, cb) { - if (isCordova) { + if (isCordova) { navigator.notification.confirm( msg, function(buttonIndex) { @@ -1074,11 +1074,11 @@ console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO fee: feeStr }); - this.confirmDialog(msg, function(confirmed){ - if (confirmed) + this.confirmDialog(msg, function(confirmed) { + if (confirmed) self._doSendAll(amount); }); - }; + }; /* Start setup */ From 5ad2532593d9a87785a046d6095b3c72eb0108c9 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 11:52:04 -0300 Subject: [PATCH 115/158] fix parameters2 --- src/js/controllers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 00a6c50d7..e574db27c 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -243,7 +243,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateError = false; return fc.getStatus(function(err, ret) { if (err) { - self.updateError = bwsError.msg(err, 'Could not update Wallet'); + self.updateError = bwsError.msg(err, gettext('Could not update Wallet')); } else { if (!opts.quiet) self.setOngoingProcess('scanning', ret.wallet.scanning); From 1cb5687d0ad70be1e202b5b2ea0fa802388891e7 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 13 Aug 2015 00:50:19 +0900 Subject: [PATCH 116/158] Add Russian --- i18n/docs/updateinfo_en.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/i18n/docs/updateinfo_en.txt b/i18n/docs/updateinfo_en.txt index 96fb0d7f4..7827597d5 100644 --- a/i18n/docs/updateinfo_en.txt +++ b/i18n/docs/updateinfo_en.txt @@ -1,5 +1,4 @@ * Improved fee handling and fee notifications * Added advanced sending options -* Create transaction proposals with multiple destinations -* Added Italian and Greek language options +* Added Italian, Russian, and Greek language options * Minor bug fixes From e4651ef7b08549a02326bb1ab81302b64820ffea Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 13:04:39 -0300 Subject: [PATCH 117/158] simplifies error handling at index + universal error popup --- public/index.html | 4 +- public/views/walletHome.html | 4 +- src/css/main.css | 11 ++++ src/js/controllers/index.js | 115 +++++++++++++---------------------- 4 files changed, 56 insertions(+), 78 deletions(-) diff --git a/public/index.html b/public/index.html index 88cbd56cb..1c3633722 100644 --- a/public/index.html +++ b/public/index.html @@ -24,8 +24,8 @@
    -
    +
    +
    - {{index.updateError}} + {{index.updateError|translate}}
    @@ -481,7 +481,7 @@
    -

    Could not fetch transaction history

    +

    Could not fetch transaction history

     diff --git a/src/css/main.css b/src/css/main.css index 3de53f411..00bc52152 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1119,6 +1119,17 @@ input.ng-invalid-match, input.ng-invalid-match:focus { padding: 0.6rem 0.8rem !important; } +.alertModal { + background: #FFFFFF; + box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.50); + border-radius: 5px; + position: absolute; + width: 90%; + left: 5%; + top: 15%; + z-index: 1100; +} + .passModal { background: #FFFFFF; box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.50); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index e574db27c..4ee500d03 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -319,12 +319,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setSendMax = function() { // Set Send max - if (self.currentFeeLevel && self.totalBytesToSendMax) { + if (self.currentFeeLevel && self.totalBytesToSendMax) { feeService.getCurrentFeeValue(self.currentFeeLevel, function(err, feePerKb) { // KB to send max if (self.totalBytesToSendMax) { - var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb ) / 1000.).toFixed(0)); + var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb) / 1000.).toFixed(0)); self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit); self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName; } else { @@ -360,8 +360,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r fc.getBalance(function(err, balance) { self.setOngoingProcess('updatingBalance', false); if (err) { - $log.debug('Wallet Balance ERROR:', err); - $scope.$emit('Local/ClientError', err); + self.handleError(err); return; } $log.debug('Wallet Balance:', balance); @@ -378,8 +377,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r fc.getTxProposals({}, function(err, txps) { self.setOngoingProcess('updatingPendingTxps', false); if (err) { - $log.debug('Wallet PendingTxps ERROR:', err); - $scope.$emit('Local/ClientError', err); + self.handleError(err); } else { $log.debug('Wallet PendingTxps:', txps); self.setPendingTxps(txps); @@ -392,7 +390,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateTxHistory = function(skip) { var fc = profileService.focusedClient; if (!fc.isComplete()) return; - if (!skip) { self.txHistory = []; } @@ -401,6 +398,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.txHistoryError = false; self.updatingTxHistory = true; self.txHistoryPaging = false; + $timeout(function() { fc.getTxHistory({ skip: self.skipHistory, @@ -410,8 +408,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (err) { $log.debug('TxHistory ERROR:', err); // We do not should errors here, since history is usually - // fetched AFTER others requests. - //self.handleError(err); + // fetched AFTER others requests (if skip=0) + if (skip) + self.handleError(err); + self.txHistoryError = true; } else { $log.debug('Wallet Transaction History:', txs); @@ -423,14 +423,20 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; + // This handles errors from BWS/index with are nomally + // trigger from async events (like updates) self.handleError = function(err) { $log.warn('Client ERROR:', err); if (err.code === 'NOT_AUTHORIZED') { - $scope.$emit('Local/NotAuthorized'); + self.notAuthorized = true; + go.walletHome(); } else if (err.code === 'NOT_FOUND') { - $scope.$emit('Local/BWSNotFound'); + self.showErrorPopup(gettext('Could not access Wallet Service: Not found')); } else { + var msg = "" $scope.$emit('Local/ClientError', (err.error ? err.error : err)); + var msg = bwsError.msg(err, gettext('Error at Wallet Service')); + self.showErrorPopup(msg); } }; self.openWallet = function() { @@ -478,7 +484,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r if (tx.outputs.length === 1 && !tx.outputs[0].message) { tx.showSingle = true; tx.toAddress = tx.outputs[0].toAddress; // txproposal - tx.address = tx.outputs[0].address; // txhistory + tx.address = tx.outputs[0].address; // txhistory } } }; @@ -718,7 +724,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r getHistory(null, function(err, txs) { self.setOngoingProcess('generatingCSV', false); if (err) { - $log.debug('TxHistory ERROR:', err); + self.handleError(err); } else { $log.debug('Wallet Transaction History:', txs); @@ -745,11 +751,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r _note += ' Moved:' + (it.amount * satToBtc).toFixed(8) dataString = formatDate(it.time * 1000) + ',' + formatString(it.addressTo) + ',' + _note + ',' + _amount + ',BTC,,,,'; - csvContent += dataString + "\n"; + csvContent += dataString + "\n"; if (it.fees && (it.action == 'moved' || it.action == 'sent')) { var _fee = (it.fees * satToBtc).toFixed(8) - csvContent += formatDate(it.time * 1000) + ',Bitcoin Network Fees,, -' + _fee + ',BTC,,,,' + "\n"; + csvContent += formatDate(it.time * 1000) + ',Bitcoin Network Fees,, -' + _fee + ',BTC,,,,' + "\n"; } }); @@ -768,35 +774,21 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; - self.clientError = function(err) { - if (isCordova) { - navigator.notification.confirm( - err, - function() {}, - 'Wallet Server Error', ['OK'] - ); - } else { - if (!isChromeApp) { - alert(err); - } - } + self.showErrorPopup = function (msg, cb) { + $log.warn('Showing err popup:' + msg); + self.showAlert = { + msg: msg, + close: function(err) { + self.showAlert = null; + if (cb) return cb(err); + }, + }; + $timeout(function() { + $rootScope.$apply(); + }); + }; - self.deviceError = function(err) { - if (isCordova) { - navigator.notification.confirm( - err, - function() {}, - 'Device Error', ['OK'] - ); - } else { - if (!isChromeApp) { - alert(err); - } - } - }; - - self.recreate = function(cb) { var fc = profileService.focusedClient; self.setOngoingProcess('recreating', true); @@ -972,41 +964,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/BackupDone', function(event) { self.needsBackup = false; storageService.setBackupFlag(self.walletId, function(err) { - if (err) $rootScope.$emit('Local/DeviceError', err) + if (err) root.showErrorPopup(err); }); }); - $rootScope.$on('Local/NotAuthorized', function(event) { - self.notAuthorized = true; - $rootScope.$apply(); - }); - - $rootScope.$on('Local/BWSNotFound', function(event) { - self.clientError('Could not access Wallet Service: Not found'); - $rootScope.$apply(); - }); - $rootScope.$on('Local/DeviceError', function(event, err) { - self.deviceError(err); - $rootScope.$apply(); - }); - - $rootScope.$on('Local/ClientError', function(event, err) { - if (err.code && err.code === 'NOT_AUTHORIZED') { - // Show not error, just redirect to home (where the recreate option is shown) - go.walletHome(); - } else if (err && err.cors == 'rejected') { - $log.debug('CORS error:', err); - } else if (err.code === 'ETIMEDOUT' || err.code === 'CONNECTION_ERROR') { - $log.debug('Time out:', err); - } else { - var msg = 'Error at Wallet Service: '; - if (err.message) msg = msg + err.message; - else if (err.error) msg = msg + err.error; - else msg = msg + (lodash.isObject(err) ? JSON.stringify(err) : err); - self.clientError(msg); - } - $rootScope.$apply(); + root.showErrorPopup(err); }); $rootScope.$on('Local/WalletImported', function(event, walletId) { @@ -1032,7 +995,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateAll(); } - if (self.network =='testnet') { + if (self.network == 'testnet') { self.debouncedUpdateHistory(); } else { self.updateTxHistory(); @@ -1105,6 +1068,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setTab(tab, reset); }); + $rootScope.$on('Local/ShowAlert', function(event, msg, cb) { + self.showErrorPopup(msg,cb); + }); + $rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) { self.askPassword = { isSetup: isSetup, From 46f78f4900e711a243a5c81f69595d02930f3332 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 13:04:50 -0300 Subject: [PATCH 118/158] add alert template --- public/views/includes/alert.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 public/views/includes/alert.html diff --git a/public/views/includes/alert.html b/public/views/includes/alert.html new file mode 100644 index 000000000..2c9ed4b85 --- /dev/null +++ b/public/views/includes/alert.html @@ -0,0 +1,14 @@ +
    +
    + +
    +
    +
    + + {{index.showAlert.msg|translate}} +
    +
    + OK +
    +
    +
    From d7af0bf9bedaf3895997cd061063fdd5e6ffe8a6 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 14:36:07 -0300 Subject: [PATCH 119/158] fix translate --- public/views/walletHome.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 47cf110f0..d2a69224f 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -481,7 +481,7 @@
    -

    Could not fetch transaction history

    +

    Could not fetch transaction history

     From 81ebe2708f2dbb5baf4b8526f60274a1f86655d9 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 12 Aug 2015 14:38:29 -0300 Subject: [PATCH 120/158] fix switch case --- src/js/services/bwsError.js | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js index a8e513f18..3dec7ccc4 100644 --- a/src/js/services/bwsError.js +++ b/src/js/services/bwsError.js @@ -12,103 +12,78 @@ angular.module('copayApp.services') case 'CONNECTION_ERROR': body = gettext('Network connection error'); break; - ;; case 'NOT_FOUND': body = gettext('Wallet service not found'); break; - ;; case 'BAD_SIGNATURES': body = gettext('Signatures rejected by server'); break; - ;; case 'COPAYER_DATA_MISMATCH': body = gettext('Copayer data mismatch'); break; - ;; case 'COPAYER_IN_WALLET': body = gettext('Copayer already in this wallet'); break; - ;; case 'COPAYER_REGISTERED': body = gettext('Copayer already registered'); break; - ;; case 'COPAYER_VOTED': body = gettext('Copayer already voted on this spend proposal'); break; - ;; case 'DUST_AMOUNT': body = gettext('Amount below dust threshold'); break; - ;; case 'INCORRECT_ADDRESS_NETWORK': body = gettext('Incorrect address network'); break; - ;; case 'INSUFFICIENT_FUNDS': body = gettext('Insufficient funds'); break; - ;; case 'INSUFFICIENT_FUNDS_FOR_FEE': body = gettext('Insufficient funds for fee'); break; - ;; case 'INVALID_ADDRESS': body = gettext('Invalid address'); break; - ;; case 'LOCKED_FUNDS': body = gettext('Funds are locked by pending spend proposals'); break; - ;; case 'NOT_AUTHORIZED': body = gettext('Not authorized'); break; - ;; case 'TX_ALREADY_BROADCASTED': body = gettext('Transaction already broadcasted'); break; - ;; case 'TX_CANNOT_CREATE': body = gettext('Locktime in effect. Please wait to create a new spend proposal'); break; - ;; case 'TX_CANNOT_REMOVE': body = gettext('Locktime in effect. Please wait to remove this spend proposal'); break; - ;; case 'TX_NOT_ACCEPTED': body = gettext('Spend proposal is not accepted'); break; - ;; case 'TX_NOT_FOUND': body = gettext('Spend proposal not found'); break; - ;; case 'TX_NOT_PENDING': body = gettext('The spend proposal is not pending'); break; - ;; case 'UPGRADE_NEEDED': body = gettext('Please upgrade Copay to perform this action'); break; - ;; case 'WALLET_ALREADY_EXISTS': body = gettext('Wallet already exists'); break; - ;; case 'WALLET_FULL': body = gettext('Wallet is full'); break; - ;; case 'WALLET_NOT_COMPLETE': body = gettext('Wallet is not complete'); break; - ;; case 'WALLET_NOT_FOUND': body = gettext('Wallet not found'); break; - ;; } } From fcaf035369f0158560e957c106a56a27ab246e68 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 12 Aug 2015 17:11:32 -0300 Subject: [PATCH 121/158] Updates templates.pot --- i18n/po/template.pot | 158 +++++++++++++++++++++++++------ public/views/includes/alert.html | 4 +- src/js/controllers/walletHome.js | 1 - 3 files changed, 132 insertions(+), 31 deletions(-) diff --git a/i18n/po/template.pot b/i18n/po/template.pot index d7cd8e5e1..9df6cf09a 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -80,6 +80,10 @@ msgstr "" msgid "Amount" msgstr "" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -130,6 +134,10 @@ msgstr "" msgid "Backup options" msgstr "" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "" @@ -183,6 +191,10 @@ msgstr "" msgid "Cancel" msgstr "" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "" @@ -191,10 +203,6 @@ msgstr "" msgid "Changing wallet alias only affects the local wallet name." msgstr "" -#: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" -msgstr "" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "" @@ -231,6 +239,22 @@ msgstr "" msgid "Confirmations" msgstr "" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "" @@ -254,19 +278,19 @@ msgid "Copy to clipboard" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment" +msgstr "" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment" msgstr "" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "" - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" +#: src/js/services/addressService.js +msgid "Could not create address" msgstr "" #: src/js/controllers/walletHome.js @@ -282,7 +306,7 @@ msgid "Could not decrypt file, check your password" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal" msgstr "" #: src/js/controllers/walletHome.js @@ -301,8 +325,8 @@ msgstr "" msgid "Could not join using the specified extended private key" msgstr "" -#: src/js/controllers/join.js -msgid "Could not join wallet:" +#: src/js/services/profileService.js +msgid "Could not join wallet" msgstr "" #: src/js/controllers/walletHome.js @@ -310,14 +334,14 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment" msgstr "" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "" @@ -430,12 +454,12 @@ msgstr "" msgid "Enter your password" msgstr "" -#: src/js/services/profileService.js -msgid "Error creating wallet" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" msgstr "" #: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" +msgid "Error creating wallet" msgstr "" #: src/js/services/profileService.js @@ -481,6 +505,10 @@ msgstr "" msgid "French" msgstr "" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "" @@ -578,10 +606,26 @@ msgstr "" msgid "Importing..." msgstr "" +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "" + #: public/views/walletHome.html msgid "Invalid" msgstr "" +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "" + #: src/js/controllers/copayers.js msgid "Invitation to share a Copay Wallet" msgstr "" @@ -623,6 +667,14 @@ msgstr "" msgid "Learn more about Wallet Migration" msgstr "" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "" @@ -671,6 +723,10 @@ msgstr "" msgid "Network" msgstr "" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "" @@ -687,6 +743,10 @@ msgstr "" msgid "Normal" msgstr "" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" @@ -698,6 +758,7 @@ msgstr "" msgid "Note" msgstr "" +#: public/views/includes/alert.html #: public/views/includes/password.html msgid "OK" msgstr "" @@ -822,6 +883,10 @@ msgstr "" msgid "Please enter the required fields" msgstr "" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "" @@ -906,6 +971,10 @@ msgstr "" msgid "Retrying..." msgstr "" +#: public/views/translators.html +msgid "Russian" +msgstr "" + #: public/views/includes/password.html msgid "SET" msgstr "" @@ -1026,6 +1095,10 @@ msgstr "" msgid "Show advanced options" msgstr "" +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "" + #: src/js/controllers/walletHome.js msgid "Signing payment" msgstr "" @@ -1038,6 +1111,14 @@ msgstr "" msgid "Spanish" msgstr "" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1062,7 +1143,7 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." +msgid "The payment was created but could not be signed. Please try again from home screen" msgstr "" #: public/views/modals/txp-details.html @@ -1070,7 +1151,7 @@ msgid "The payment was removed by creator" msgstr "" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" msgstr "" #: public/views/backup.html @@ -1081,6 +1162,10 @@ msgstr "" msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "" +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1126,6 +1211,10 @@ msgstr "" msgid "Transaction" msgstr "" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "" + #: public/views/translators.html msgid "Translation Credits" msgstr "" @@ -1164,10 +1253,6 @@ msgstr "" msgid "Use Unconfirmed Funds" msgstr "" -#: public/views/modals/txp-details.html -msgid "Uses unconfirmed funds" -msgstr "" - #: public/views/preferencesAbout.html msgid "Version" msgstr "" @@ -1212,6 +1297,7 @@ msgstr "" msgid "Wallet Invitation is not valid!" msgstr "" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "" @@ -1220,18 +1306,34 @@ msgstr "" msgid "Wallet incomplete and broken" msgstr "" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "" + #: public/views/create.html msgid "Wallet name" msgstr "" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" msgstr "" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "" diff --git a/public/views/includes/alert.html b/public/views/includes/alert.html index 2c9ed4b85..a3a25ee4d 100644 --- a/public/views/includes/alert.html +++ b/public/views/includes/alert.html @@ -3,12 +3,12 @@
    -
    +
    {{index.showAlert.msg|translate}}
    - OK + OK
    diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 3c7ae8c5a..bb7df5bf7 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -724,7 +724,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) { if (err) $log.debug(err); - console.log('[walletHome.js.757:amount:]', amount, feePerKb); //TODO fc.sendTxProposal({ toAddress: address, amount: amount, From c0c3b9db1a1bc793bd07cbb542540a2c78f14fd6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Aug 2015 10:14:54 -0300 Subject: [PATCH 122/158] Updates info --- i18n/docs/updateinfo_en.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n/docs/updateinfo_en.txt b/i18n/docs/updateinfo_en.txt index 7827597d5..b3fb2e069 100644 --- a/i18n/docs/updateinfo_en.txt +++ b/i18n/docs/updateinfo_en.txt @@ -1,4 +1,5 @@ -* Improved fee handling and fee notifications +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs * Added advanced sending options * Added Italian, Russian, and Greek language options * Minor bug fixes From 19d24e808493b8f63738a0479ca33ef50a054749 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Aug 2015 11:07:24 -0300 Subject: [PATCH 123/158] Fix tx-details --- public/views/modals/tx-details.html | 20 +++++++------------- src/js/services/feeService.js | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index ad1160134..d4c04665a 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -20,21 +20,11 @@
    -
    - -
    - {{btx.alternativeAmount}} {{settings.alternativeIsoCode}} -

    Details

    -
      -
      -
    • - Note: - {{btx.message}} -
      • -
      +
        {{btx.merchant.domain}} - {{btx.labelTo || btx.addressTo}} + {{btx.labelTo || btx.addressTo}} @@ -67,10 +57,14 @@ -
      • +
      • Fee: {{feeStr}}
        • +
      • + Note: + {{btx.message}} +
      • Merchant message: diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index 1924d0ac8..f2316f733 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -22,7 +22,7 @@ angular.module('copayApp.services').factory('feeService', function($log, profile } else { fee = lodash.find(levels, { level: feeLevel }).feePerKB; - $log.debug('Dynamic fee for:' + feeLevel + ': ' + fee + ' SAT'); + $log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT'); return cb(null, fee); } }); From cebd8fe06eec3f6b593b719b7a97ef47e34286b6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Aug 2015 12:59:19 -0300 Subject: [PATCH 124/158] Allow only dots to separate decimals --- public/views/modals/customized-amount.html | 12 +++++----- public/views/walletHome.html | 14 ++++------- src/js/directives/directives.js | 28 ---------------------- 3 files changed, 10 insertions(+), 44 deletions(-) diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html index a50eb0764..af03b55de 100644 --- a/public/views/modals/customized-amount.html +++ b/public/views/modals/customized-amount.html @@ -53,9 +53,9 @@ Amount
        - - + + {{unitName}}
        • @@ -63,9 +63,9 @@
        - - + + {{ alternativeIsoCode }}
        diff --git a/public/views/walletHome.html b/public/views/walletHome.html index d2a69224f..6d6e027fb 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -388,11 +388,8 @@ Amount
        - - + + {{home.unitName}}
    @@ -400,11 +397,8 @@
    - - + + {{ home.alternativeIsoCode }}
    diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 6ca44a772..4388f99c4 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -92,7 +92,6 @@ angular.module('copayApp.directives') require: 'ngModel', link: function(scope, element, attrs, ctrl) { var val = function(value) { - if (value) value = Number(String(value).replace(/,/g, '.')); var settings = configService.getSync().wallet.settings; var vNum = Number((value * settings.unitToSatoshi).toFixed(0)); @@ -120,33 +119,6 @@ angular.module('copayApp.directives') }; } ]) - .directive('validAlternative', [ - function() { - - return { - require: 'ngModel', - link: function(scope, element, attrs, ctrl) { - var val = function(value) { - if (value) value = Number(String(value).replace(/,/g, '.')); - var vNum = Number(value); - - if (typeof value == 'undefined' || value == 0) { - ctrl.$pristine = true; - } - - if (typeof vNum == "number" && vNum > 0) { - ctrl.$setValidity('validAlternative', true); - } else { - ctrl.$setValidity('validAlternative', false); - } - return value; - } - ctrl.$parsers.unshift(val); - ctrl.$formatters.unshift(val); - } - }; - } - ]) .directive('walletSecret', function(bitcore) { return { require: 'ngModel', From 03823b7e5359ef29235d2d37d9eb1f921863bd3f Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 13 Aug 2015 13:20:34 -0300 Subject: [PATCH 125/158] add logo chrome --- public/img/icons/logo-chrome-256.png | Bin 0 -> 10900 bytes public/img/icons/logo-chrome-64.png | Bin 0 -> 2277 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/img/icons/logo-chrome-256.png create mode 100644 public/img/icons/logo-chrome-64.png diff --git a/public/img/icons/logo-chrome-256.png b/public/img/icons/logo-chrome-256.png new file mode 100644 index 0000000000000000000000000000000000000000..803f97494159232010edac807b2aee35d3f838df GIT binary patch literal 10900 zcmZvCWn7fq^Y<*^=Ug*$=FFM-&Ri3ss33`nL5u+cfiR_|#FRlGFz^!$LPG(*bR6ulz$ z*>cTjYUxnILu$Q;<)1$jYuMeNZR;cmM~q_I{w_)eX*~+kd}c~8`^n@j*3}q3Ht3N6 zo5zb%r2Cv*5*p>Js`0-2x0c-y}fu;n%oS*FnFpU8*7=6s4K+%KVrau}{3s=b+ z)Ha7*NQ}HzPB;Cd_gEISl11wE~&_ z#BSa$>j`P*@FP}e!F|WNQluE_APUl2vb?Me{?pl@U4}sW)Q4mN1{dUKEAFYg%-YqF z!zRb?uy~%d6o++?XbfUtoiSI(v5l7+*pQ{kucr%YS2Vt+2y*FHI8oV|M>+Lq&wJp9 zx}2J;xL>jzNC^-=1e1CA0wU#C@>HMHZ8u?GK81(x=o1PEZE29voJ>0h2C8dNPYgEC z)7S#&!G@qe-W9XZ+M_MtQP@0A`d?e>=0_V12NpKqK-%nI zW#*%{pul`z%C%skE6x*s1l@L!^Dqe!CZgB!fk&@)xzc$H!w`YBHd2%=3`?MLuw8r7 zHWdfh;yx3#Mcel_uLWrV(1eN}`cCTiZDkHH%|CjGaxFj5fwk*>+nF3-ZqNe>KtT?M z2_w-EB1{2hR+d3{cE$)+poQAAx*cE!^o)`KBf&F3TDIs zeqg4h8L-GMq#01H{ifq+A~5rW$p+>D7`FUiObZ(VW=?Ej=(X$sLmQo29jE_~C{T$O zq-xx9tr9d_qQGF9AFpOPN#C~mq2=#KdR!1HUJnoZocT(>ci2@HV%gjbY4+OKBUyN%?cR@>zuU0-Oc$*>=0lVS+VufHbXBUAVMU2E; zXeF<^2VQIs>9?%m@0Wk+)Jm3?;pU*PnH)rEu`XJ2X>Du}WY4#C4TsxMqFf*P@jEwI zNjj~mNk^A^v~$ZnHxJthQ4faDPd{bPfF_>!)m7UFaOCagZ+;SSSVak%YP{drkgAJ6 zJ6Za=Z1ew4R3W*hNw;hev~usgfpOKy$| zJV@60vc1)}#%W0OS`+(l?ys2LBczi7n}RR!Ywl3XXLhlb^hn@PydNxzFGj$Pr!yb% zaK>}LXPBhtU8MTk&(s~WVTJWJ;N=akE!@U3j0c;|5v@zUY%N)rpj2%5l+TbXtI+x} z=DAeLRSmvyD+HW;(c|0ciw+g+g}{9EK}<&Xwh$G~3Ku+Xn|c3s$;hl)P0#Cw(q@WW zXkxhK{dM67UruSa>x}{_+%A|uH(*26_C@x}6D#^2XF?Z8Q=?H0Y4UIwHRE(I=JQPN zc;F6G(MAbjT1$YEXun?N?d?U~Ig#rzM-OYQ)wz(qlUz$}d~L+|YW<{Gx{m=U)%!+4 zuGWywY&Bx3+*yneB3OH9cGwWIGGd(i3eD8}yYol`$gvIlyx#tveBjni$f$E>Y1VM^u0*Q8 zHaIH%4lCyB{IYfZdMT90)O&-Ce7RT-;+s}psnDeS18JwA?j~#&PV%gDn%#W8Ti~`~ zYpW)^P8-0PSbIEzBhDEoN6etSVfwQcRZ*59S^c2#qQg7ky=EA9t+-ly#iUohgnFTGz?jFCT)o|yTZ{l`5sUH;^^3ssh$oxQI^GG3xO1O6p{U9F^I9t~SC zZNLlD@NH|-`6oSBvrO9xyUNwQ4CySC^f(`xcJzw%D1Uyy{3cEd|IRG(cdj%)CsBDF z-dYZcs=KhHCVwESzoM8bZcqG%y&$Bg=1}e8_y5-anyL1;o!TF6pRbSDx-h4B5@l`h z^S4J&a^_WuN_~>yMvNOAA6?Ju^VuB6Kr06;f(rPv!YSODmu}{bPfkuok};DuJa@kH zSjw&EeH$AR=faX)k4zDhF#TmJam3Jr((>K%3GUZ;x)m0=Ki4UV#ZUe;|C{ALX_(+C z=opT^Q7$Hbb9;Shk?FV~jD8|QN%%tkqIrsV)s`wNAqdD1~@KXRBEhip6Qbxb3;;8I>H zH8^@!yIek3P4^3;BK}+2W!qQ8;dN_jX}Ha9SCtZZM}kjh)x;e0(9PQGsS3B%ih4Bx z8fF4o^uZ*7VRDQnJ!HVctAQN04qFL}O5LqVu5nC`%K4 z3>WnOw|880*6khX~XjGE15W!@wNPd7Eir<^J~e(2%U4_1z$w zX)ml#cb#$#*S9rlZ&&ZJ06p7*x)W=q)Mk z>tF$zaNPOOm<>EwuM)cRxq#Ro34sdt5CvRrDmmX{j@tw9JEyuTEN;-G&i#ZzZsS?( zUT<0DZ0>iVnCGXz3oCtkWf8-iiLTGq>vHl*5h(XIrx+^Zc7&T&pu)P`g41z4WvJWb z@^M`NEh+J|%JkB}Nx@7fZ#~L^5oe6wPxvf|NLnR_W$$YLa^ZfKC#>A!kvoq5H(sN$ z6Uib=&*5gcPR#Jb38UBTqq3*c4IBk9YfcD<$a}c6qu_OqE?jlg>Ny#@wLfNkWs9CQpC$qDvF`66oVP)r*o&Y>}pS+sJXrH-eNn1*yN+^RoOaOBPe&f}9pzc|1oE z7N0k`Dhi2f8G99k2}3dS5I;)fB`!(Y_ta{-@8yw_Z_ejo4D6$T3K}N}@hd-Ml@Wdm zZ@39|yd3@8x8CtLa?`Pm%vg44@!N=F5IYa*s*TQ4nyb=e!Q z^%7C7AOrbh|Fl&H;WBgUXZr&l)a`#qN;>4g;KW%o#dVxBt8;RG%)8R2=e?6}$6tC+ zUy*Zt_sLtaSr1}9#rW79mBhlT{Uly&uuy57CYvm#N+0v*0U-_RARFWAHMzIXo!8&e z3g50yrf~SV^cT}@Ui#^~=nQ9YBiuzywP>p?>!;e4wcYKRiGAA%eFxdcR&uY4RW7k4 zPf(yiu~x5c%|d?BsS1XZ2UOntAy%J%!LfhH`;5YSd&L83=3NxtUO-oS0w4KH5`h6xd;qVdZ6bNb}dl*BdOv8?@kt63%Z;se+d(Co}R;}Pe%gRJYG zBegZOvUdmPOXZ7&C^n^@rcH& z=#_mr2oG?*;W%^ZcFWoJ4;M8*0?Xj9fFT;yz)0SX^IRoSXLF&L*zmZ0?)|aWHo0^L zfO8>L_UcpqK8l5lvu+Zpb?B;fc@F1I^XGpS0=fEY|IW#r+V?ulXH(4=PFYz_1w8WF zP?@|yrT%ZQ`Mh!+>_RrdD(+_-PD&1L$U6 zhf^1`ScC9gpiY+bU)5lO$B|SIVE1nTMnqEX4?P+1h>P4}rq#S=Kd!dILaG*&bOsTI zqewC#P4R<1rCthh_wLmeq-1e`#i#7wJTD~Y)qldP4`&=-C4S~=pN}m4R$1N;SeSvL z+DnoJjhb9864#xnR*VD~F(CBBh{G$_nRFklBZm4vF5@mHID7)?L)9lt- zJ7Z3CPeem`*}MOg17QXK{P$aEt2KX*#hKp@G)B(mC*n}3!pV3QW7o~Idq5FvLt$H!g(f1vmyxabt<=c zMf}nOIiIJ4HhH4x+h!t+1{mfvtf!h7haCx%-6Tf;%6Lb})Q434k9GF$n9to#*+#(?zSsOH`MtyxqdlTn2xgZ>8N|F!_ronD6e ztD4{x#hq&8wrM0w!+iaS%}Ch6QoULw3y34IH1U`3|79z3SzDl5)O4^=7?BJhC`z)B z&=PSrL)Z;*c3!1vQyWq&4zQzel{!uL+b*VM%wj@C1y)}}gdrf6f*_tQ$aXQU6j1a4 zzkLYUqX2zlvN^ugYSl>d1QG941^@h~&~$TEY}giPZ{l<;3X#ANp$o9(bU))#KUueS zl0fqwa2VVFbTXPx4x(PCEl0y+3;aiql%pzqzMBH4^w|IhQ#{|EsEgrChJK}Gup)~)H0?gBPn|h2nk1DHSgpd zN~B0=3-v}p^l-i3=l=L8e6tqR+;on*j&_nI`L5sJzME4Zn)$*ZpH1xFj~!* zw$f2h#Z_g;^?n+-v8oey%=J!E@q}aoMpCyg{yfY_S$Y_)=2eZb=l&Rs_GvVDLr|t^ zc}}j+`A;sV@`ZA19u|ET&M%_Scr2wgYsmWuQs~6bchiJ9EYDTg%ORdL5f#5@<1BgB z53ifcJ=1K7Bmn@)uQ^8KykGjr&lyYTeN+0oPe0#exu@lk%{8#StJ!h+Z3CyZ0yAUX zJ^=s~hTxwoTw)Y3H9CW^k5ID|$eIfO+zHW{f)0bCQKo>|2w!gA+bcIAK%^qmw$5?6?1fxL8g>q2DN{yF-Y>L>5X&4!M)H- zt#{dMREmHU5p9k5$qh0iv<7_ag1Nz!*iLkot5 z!n?R8l!DXBu=U&yY?$thxbLp=J-)AZKi}gFH(X)4-ecZh=Bsp|K*(5sR}7~>TO*r` zE8U^};tmA-+k?%1rURBT>4Cn>*%g{kgQ#oIyd!fcl73664Hr|S4fnlXlA|}Ny+}+z z@gZJLp`Cdm2no4Q*e6Q?lgezL`?!NcrE|QZ$62Fo5^wQdzy=O>UGmBje66fJTOD`T zS!23xpz|$yhqPM^K@ip8l}=JarnKOhj-0Jl4U8`*X8lJm*@yBP zUkWYtVaeX^PERI0>^0k8Js@i^M9gn}_XMG+H|7PQZuzp2k!5O=rNS6F ziIW!UtskToI4$zmB%o{`SWH(3p9eZ^eXZDIF&W1t0gol*6PNw&H}|jj+OdS09tca1 z>2ONWcj2;c@A+IOBuw7=dhz^#V^td|$l0m zIEe(+x7EehyQs%((gGX04i{f^tLz1a-c#=@1kte8S4WD}D6sF$)-^t4U%wJ1X7(d~ zlGJBy>9Y2$4z3Ev140lR&J`nck##uYcS1lh|7r*Q0Ur@-J-z?~H(pM*2^uy(p_08C zne*l@zOmFJL@YQ%=G;_%go=u^gz9&ObC~Jb``pw9o5e;7$7Ve=t+DIj8eL!IX5%Jgzp(LSDD6K_zg7MebN;RbgXaSbRe zVqQFJgik|LBsKg4C+><(mF6h>cBYp-xmt#IU&2%ExM0PXt=mDE=!ACrlTA)f!d0-(p zI+*e7!LRCZ{{RD`0wSe_8V)gOfOa=l_l_arXmJuYx;#9J!IOsyTXNooB5L`)88c!3 zBq@L*bh1m~F2Mvvhj+c6=vpV{C%{cmD-cq`sWiID}2nQ{H&pYK8}5^ zAb`GO?cSJ7(TPWJCoj9vS`;_Z=-FCN?y6$dcoea_gek#LsJO^PN?w-&%imp&5}cJ5 zBmi*1h%W?AN>wDUN>x}}pij`_E7=Z~R-=lg)TxE-Fb&7V&$ABgu74K&wb;kK&~I_F zMOFO~_6@g!^v%^e9k|g>_(3F!I+x0=oBecB%{q+3z3SstVb>q7fRv+ zj|s}?9($fK0T|gr8C5L7=LdiCIXlVqR<*2-w4fKNi4Ef0fVL{#Sd-aOyL3qQf8+*f zj%bHGmyCRR$n!?CpylhOZTtHX^>to9PTYTi9V>mE0;IhklYmi4A}M@pyq+SMAmZC6`vZ2;bl z_oI5v>fXS&O0XTxA#pOnkKx^21X$MX7-QV#>%0xXjLTTU* zhp7e>nfSxc53{s;hdy~YnX^)OWtx(G!`aO67omAhAqysM9ZLmL-m9M4S!aHKSi~NU zE##xP|1p(1&D|Z{`GqA4gM-D{S+#4$JtXkbbyFJfT;*}}*>g$bUi>I2z{zGiZYCj@p>6nnbJzcuE+Iqh(AElUF8kcftZpz_>GZ!?I?LxXpx;{wC}^q;J5$n?GB z%sFHZ^3c<1Q9bKCv934vEZMpJLMZtaj{dGF_Lt@W79TF2qu#;SO*=}lvwqeiS|~%^ zDLBUPgP%;~EW`Im!`#=4u>=VvS!-Ri*MtDUV?#GA> z6i_rtI7^S0i;5O@P{ZDMaX`-s3KM9dY3+NM^BWS)$0I)rGwVCOp{E@b?@U(Jcc~u4 zvZjdhe`3ZuY&JihwCY&0DSXyxClkC!n$RlZ-^kbY?Uv7Cv*|Dx?ZlqSkWSn2o5}L! zx?2zVdP!eoGNzOn_N*h#(1tH~I!Ta%f+@>%dGbg6C1s&|DFAdVETNKKbHdLfWNVP9 z(e^^?#g8fE5Bo_!Zk#72L?iI0{n|~$CF8!Vexlb6UmHZ{Bw_n>!IYVU&|r-z3hykA zEgbT_%+YaPvQP_WH&V9UtHSn=*l}^;^*$2(RkjqY-$6k}J=7}X7bG(#RwF#`gM@fo zEed{8i4M>x{t@-%^n+rRgPIj6wrcEkOxI=E$LCZI;xFi4*J&YO{$o zJ)9ohlA)Z3?(YzW&$tw2UYSArh%1ohmc2i`@%r04pJm_Jr}o}T?VtMhSE z2ceoE(Zqh?KkU_Km;8dX#30?pG1b-Me6}yb4Z^oRuB1NmO?tdK$`j?fo|eQyDDWAgoif=G!*o zYgok5hYutCo?4F02D8VSKnTYOE7XfM`f~S2NyChS@yYB>_-fkMB<}sPze?QZJ)%@g;hWX&zQYIHybT^k)&h`wR#Cp zcoP|eE}WS$?8W(_UXfi|d^rn4uzaTzr>B?0_YWlrNL($G1vkY#k86YQ^-8=N$;lwJ znTlmKTb+wZ0~s8~8_1S#yh|?Bl2wYFc4Zx~J)P!ACp~v}{ z#K7{-+f0#;!4uZVKkvclUL}mAnDWP!!Npp?1 z9hlvyl_WpEk?irhE?sRvwYtO`o^NZ2Jo?)c?yh|6PBq4D+eHOc_b1905YrE$2y;!Q zzsL2zxjYdi_r^sQr*?DQ%#hK2a`?&U_1STU>2H{!h+9zsZ+z}hmP$9lE`If!=QvML z7YA}(BMV7HilBd)k0t}_g1zfDu}Pik^fvz`S)P^oo*#wLH+J?b8AQ2@E6Mw##qzBY zzHHM?K7zmYuB%sgJ4+v4(z_#eUagsM8_hILyyu+0!bB{q1hc&|EnonyiuztBg>VRv zu!dr4yT&iAJ+nYsmd2Z{rd+T}BT3fBS810pOu1~C^-e#@-OL`%#>G`#^1bDIQIP1K zPvTKkTe1KO2-2&}85*$!s#Trt;%}_m-ncGv03~6wZ!YQu@i4X4edowKb+5T9FpX_J zNY)K+^ocr|AjVUxefNUY$%={~Xp?dJ)sF4Gb$|n=TK5JYtniI_XzLGsJnn6@S@I_h znfn1QFz^08`Y{Z2iz%UJB=!8fkjlrQszum_QMB<@PWB3~|w(Scck{OUY zUmYC|hab2J1CHfFbbIesxKyuX=ohp zR8YNf#VW#t)hDx@FC+ABUR%wJ`6p1($msgOl>{+Vzm4;Zz%Z`RD$j6-6Cr>awZ8L( zT3qYNxp_~VUy7La$<*6hE%L_i+3r_nOas-%(3rSMB!u|Rh2o@l1A@N^jN5-6?l8ZE z#83)PiYJd`@r8zA;EcW4VpZNNE1?ILs zx!J3tvcJ{*L#S`@P;+4sp(1S`jFFOup=S6KxjrJWFnSa>5fesW!KAW|{)IN56O`HU zRb=h7GxvBDt^`_2ogr%%;QpkWb{5#eVEQn}gV|PO%)e?ndV`((L$YsnJL4+l$!7HC z9AiK~x1APo@+R#AA%xM78{4BrK=ZNQCGAD4TlM*)nWpe-Y9p5ut1jv|ldOs=FAELy1-3^`d`$mUk9iwFMEv+@?F*F32TyDM)M>$!&tQ3-8y*LK0uC zUp!L>=&bTX6VFy4xz7GR-9*Tp9(u+{YPY+hW8{&DHk~xp;%=GZylGF9MfA`NfyB7K ziC;(aJS#1b^h?eBGmW;xhf-ofEs&U6kOpWWwusR@4Cml{Zl0+%qXn`G{SqSFn8(u; zJRQF{({M}(J^It}FF;(`+SqIxuTmt{<^?3Nz)iXkEtaA1V*$RyT_}1Lm@X)-xt0v* z-hi?)OW6C_OSIHbQq)Lx7fSFQUr)_AmH)Kh`v@TWixJ~ltxxG}c)axuVv~CiN#tfF zemX($xH-75eJQ}8;ojJD69J|3H4234YaVF=OdGF`XT$)K1r|67TS|*M92VhSTQfcX0vrGE#?HuF@I$?D zC9CzH7xO;&w;~NW_nY|9FogLK+&;yi(9>1;9z91N_S2Fm8eXmzuV+ z*|;jiK8Mr(;r477dlS~U`{bluX5mA^r%?n#mb+i|8YTK-^LgYgSo|;j{C@Q&#O3&*#$g?Ar(bFbr`sIF)xuAD@nkauI8HZ$DJ#r-k}&%c9F zV%pN!VcvGeJi%8g-8XOtJ$8B8EDd?t5J4{eB^VlstI3R8tS+4lmZ}HolvTv{9>qoC zVvK)q^e^tc_wA2k8k>^Axj_IV2t^y|O6eCT&paJpf)kJ2h_e(7s?5jd@pk^&qIew_ z`wr;;Qe;Gn{p&spiq&CwQeZ+;u5qbQH&_t?nr_}x&cPS9#79jK?f&()ow|pRWUc^h zL9Xx1H-@==oq5s&GIx)pzV#0vE&PDY{(YMMkoT{(oSII^eqRVMXn%N!ett1ymsgS&74e?57dsu2dmBOzPFIi8Q~nKyZQ4wjK2C56cvY` zZ*Vr=e)=r*kch5|4Q3x_CAbZ~esE2mZ9Hp863pKN$EuMox>`vV0~7?>5Xh=|*ary_R4Bbf>~HOw2ZPYe;DAuPC>$dfbUoXPx-pGibPRCodHTYFGc*BSrayDZ3a!5{<(A|T-60~NJe3_gMKrO_mx>TR zYV8nq)D#@I`XpAbST4P70z#k<9zTr(AD=>b zWtAPaC5zIr@%3N8Y_{O1ue^zZOC@&s-z75WpFqUJA^79Q*I|r{mile6SgVRrHq_;`V0&>!%T;i1^DZnaYP$iH$GSq(vR0uq_ZzO%Lmz`f2ctX{tf zH*ei`+5h0tK?pSXlV-QTT;mzSs1HyZHP zu&J#0@)ehT_4L%^_?|z(dz8I#iawc@uf2`#Zj;Np1If^ofH&4;AuJ?V>DTW4$8hF+ zff9EmbTTcG3Fz$V!UrE7#rF5J(b?7Qs>*=VH6tKtVmubio1=8>ZpS@r|KOiW+?7CY zIP=9{N{b(p$&A9{QqWVYpcw%)Z`+2y?#)3<>mA!9mvVD!8$M&p-@yo)Y=+WOX0mnt z1f~Bp>c5|TSc$unpa}uAzPAm#_8dgVy-wRCw~PQb#n6g!Oh1()pN?iNv%0KMJ=3FF7vVZ2mQZWnjA zh^hp{$3!Wc9T{kO<#kzf%crUYOpK4U14-N1rj}N_G&$5?*l7WL}0e23n z65t5b!)7*c%yXBxrUb|v8g~KPTR&7Kz~Z3pWY!J|R_Bz>xJYdduBb}DwdxutlH+5e zoYEd7fk^z-OV4BR!n6me*6*^a5>Q%k)v4im%&Ifc@KBHef7$#7GT63y=Rfuj^l$pC zrz!#8T&o6IZfwI-^XDPJ&(}7oUvft3Z0z5)1u;>N;OD>I1hOY+5mY6BI=JuP3A=s< z`1|5FFTZ4$)>mZa)QQ;h=RaWUhIPz-(1zz%tw+_3+Pt}z<< zcWrqa(PJa*+9Pwjov_znXKq?1y1JXnWD7-lRH*#3a5LpN&bP*hrh8?|+EQJ2rL%yS&e2E)^N7hIMZXol)zfMZ9=}qXP|c zw(=~vSb{A({;tH;6g1ZW$IgeN^0&@-~kg7#ZGJ#Zb9!*&j0~g zViO_+6L#u1<-%%Z#A*iX05+J zxCmy3(_6J637wdJTZh7iz#h~#k|qR9HpWR!(8@0R&?m@d`-9rs4K~fHBl^cN!0EoY zQsITs?E=bw@(OZ0d=MSPV^PE!B!pWn(%l!EQMj$gQES_}CIryv{Z;X0>C~4NE^Qfr zcNjbH?!n=2X`y(wdK`9EnqjuIpoDEmBYcQ}EUD<^XxGPZG$G)?u~Tv%HGRs1yeZKW zWnRHBv)e#&XzT9Tg6lm*Ioau{`gYi<1q~Cr8hd~h1eap|gg|((0XR0;7qNZ^l$NjD zbUhPjq5(?F8VhaZA|6f?q4Q#!ZG#C#?YohX7|90NI!q5gq_m!s7p2IK!jRSg3-h?w zp6XG1-cLYNU=`B6^I-6`o+ZjJ8H1zwk&d{PxCiJ`;Sjzc*;2$l1JQ!8bRN1<9D?t* zB6HGJ3E+|Qk@)@YBv=F&@0nre5+7ai86&{nrK|8WbOfFqMDvU0FfI5NLiKlX{y!n8 zuJ`L3fQURcJ_;YP$z;eAATT>hTbYP6Wubk8w#g;zJl&!dd6BSK^!&P~G3(?w#s zOH0>DM+9;P(t35)vYfC>qXXTcrMt8vK@;fB%lC%qg)4`78n2gCdya|Q?xjZ~n^kG_ z@MD9cHx(N4!FqkZkbU!8*?r*^*YXcn%9#EOte4)&14aqr00000NkvXXu0mjfU4U#l literal 0 HcmV?d00001 From 19ee4424a42cc4be51f70d65ecf745ab0fad86b3 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 13 Aug 2015 14:54:53 -0300 Subject: [PATCH 126/158] fix commit --- public/views/walletHome.html | 2 +- src/js/controllers/index.js | 2 ++ src/js/controllers/walletHome.js | 29 +++++++++++++++++++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index d2a69224f..d4d1fc9e7 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -295,7 +295,7 @@ Send All diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 2f5188fbf..cb050f6da 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -328,10 +328,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r // KB to send max if (self.totalBytesToSendMax) { var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb) / 1000.).toFixed(0)); + self.feeRateToSendMax = feePerKb; self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit); self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName; } else { self.feeToSendMaxStr = null; + self.feeRateToSendMax = null; } }); } diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index bb7df5bf7..7d1e340cb 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -722,7 +722,15 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi address = form.address.$modelValue; amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0)); - feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) { + var getFee = function(cb) { + if (form.feePerKb) { + cb(null, form.feePerKb); + } else { + feeService.getCurrentFeeValue(self.currentSendFeeLevel, cb); + } + }; + + getFee(function(err, feePerKb) { if (err) $log.debug(err); fc.sendTxProposal({ toAddress: address, @@ -803,7 +811,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); }; - this.setForm = function(to, amount, comment) { + this.setForm = function(to, amount, comment, feeRate) { var form = $scope.sendForm; if (to) { form.address.$setViewValue(to); @@ -824,6 +832,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi form.comment.$isValid = true; form.comment.$render(); } + + if (feeRate) { + form.feeRate = feeRate; + } }; @@ -841,6 +853,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this._amount = this._address = null; var form = $scope.sendForm; + + if (form && form.feeRate) { + form.feeRate = null; + } + if (form && form.amount) { form.amount.$pristine = true; form.amount.$setViewValue(''); @@ -1042,8 +1059,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return actions.hasOwnProperty('create'); }; - this._doSendAll = function(amount) { - this.setForm(null, amount); + this._doSendAll = function(amount, feeRate) { + this.setForm(null, amount, null, feeRate); }; this.confirmDialog = function(msg, cb) { @@ -1069,7 +1086,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } }; - this.sendAll = function(amount, feeStr) { + this.sendAll = function(amount, feeStr, feeRate) { var self = this; var msg = gettextCatalog.getString("{{fee}} will be discounted for bitcoin networking fees", { fee: feeStr @@ -1077,7 +1094,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.confirmDialog(msg, function(confirmed) { if (confirmed) - self._doSendAll(amount); + self._doSendAll(amount, feeRate); }); }; From dc303615e4119963c9d17043638f6fdbddeb1173 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 13 Aug 2015 15:40:13 -0300 Subject: [PATCH 127/158] add chrome icon --- public/img/icons/icon-chrome-128.png | Bin 0 -> 6437 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/img/icons/icon-chrome-128.png diff --git a/public/img/icons/icon-chrome-128.png b/public/img/icons/icon-chrome-128.png new file mode 100644 index 0000000000000000000000000000000000000000..0044af9ca10ee2f69553bb2826fe539cb8adfb09 GIT binary patch literal 6437 zcmZ`;WmFqYxDLT7E`{PwD3Tz>DJfE%Rj4xIqAbJ!1esBn1EPS?e^|J0`;Fhv8WxZ- zLtlI+B$flB!5VaIP0d8z2O1BLtQK6w>J}1QMV59GMl<>7U}q*{%r0Xisc+@8l@ESq zdeTu1cZIdp9*zaD#o62IvZOVaCoRDT@%>-e+zvShFA*`j6K z=ctq-V9o1zAaC20LR@)L8)&PkP>vQEpxB8IBJKqOJp*2@28L5(yw$*9eOO~AY_U!6^gk!Md(o{*zVF<8@aln993G_ zi5qYK_MNvGX1zZ9$3oIX0ofekH#Q7*ZZptqfCAheSb&8Q?OgDu!(Ug{)H_=dWX%1m zpex50tssrhVm!b8NQ_b%Mi{;U>RUk_X1$wcy_wgp_;DvH?fkRSXP?C;3yNE9-F&yu zZZ9!;#wHk|V3Jf-&B5g0tF56RJ6(^LBaq*eHrl#K4p_W;942kJ1HZ z_($oV&(H1A#e?HMmDiXmKO}QiaehR0d{dAFpb`?{N=@*G^w{@ox5maNn;Or-Y*kh z@>N2z1Lx*`va*>}r|_h@DmKSf$PyRhNkMRfpb%)~!f<`z%h*h@;pHB(3~@i~ICxlL z-xF4;0$iNk!!PwlN}7;JUm5eo*7)X=S8}!WE~9fT%(P*_{uP}dZjdSn7e|qmMAyiM zJfI?r_KHSi%;wlW+nr79e?Lf|e@@wlxIcmQM(Awy$Hk)*%>NB$p1p&Lo?3^hQ$zI7|n69qE^Zj1Mo6{(*<&9}@$6mHdFQbMv76ccy zWwgJfAj%Uq&BUpvAG!pinVns~R5Q>R?lLP9`g(?|wO28@wBNsdZWexVO$bDkfBLjo z>!0k~8q)os4}e*WZxl!@1xgSa!=IRVMA=e^f#JV9zl7X+Ka0lIIz3u{*B>*n^ZL5v z?RG)hacfFPRx~~}ITyn)1s~<$SE8zM$43h~5ckZe`(gfc1@;RrSJ6zJp8j&$G5>`H}B3Ah_G)itcR}*yzzuGqVx}+7VTdjuqU~|82!$bgN^XTfaOV`%Uw3cW77V;Tk)fwgjt%@VU%GDtnWr zF?oy8=owQKS+hKEe4h^bwo|gQM9K_gwFEovuCEbyrxu<*0ZvZsCRpb<=R@P8lxMmN zG58MwfL`tWFnMMGQI{#t`ADJc&H8qS=vs4oerfvi`FLfmotL@dY+Z{-WcarY=ab9< zI!bppr(0`O-{%`FyVg`vAR!d~Cd>EWop0-=S7S!3$)QNg*P9M-$K>(DDMg$NTJ2CT zpUT_+LhCs~TbCziMkf-u@Is+rEHh{dmUzxTPRL5*EsGhaTit}O zY(K7eEAQZEI#2{k3kJzl>6DX_Z&lwG4Nw}LcY}9xt@Jm^%1q0IQ!rBVq z+uLvlhxOi67oL6Za5EHXkF%%Yts)Rt7GK`dUy{Vuhr3UUv@0}9H`2j%f6Sk@iomM6 zVwgl-_O;8rCEJ&`x7QvLYi)57OwEqYcX4hK$4Zp7)82eD2 z*!?d{lWI&xBZ=&E7eqY|m*RGhcH8!6D}Uq_!AGC(HcK@#-VU#!pF0U7x7=`#GEK;( zJ+x%+1JZke(I1R=)0r!fK07j)(!W(iN982;lIZs#Vl?8vJ*RXZjsnY;$)SY>_mi$G zgA~_HRiWq=I%sgC^=ZckeQdyLms_c}Ca<$vLK??q>+_IuVD3aCcSqhAlmO#!C_R=! z-^JOHdju7VwB9ob!AjiF&p69kvul(+s`L(lZBY1-Ql=BQ&r?IceQ@8-q zqY&*j61fzLEs>v1|J8wM`}JJ6Qd!(PDD#HbsWZ)MwM&>{@52%?QRMbUwXM@`_&)=Q z8-2V8F=V?V86f8Y0}4p5%eA}f>i!VfAs2Y>zC^rC$HBt|AYxz{>WgG~VQ=M8QvCMw_GX ztl-p?I}?MyD6=~{bYsVDGNTpQs$ZNBKa|H>#g8yRp@={A zTTQ)Z5Mb1|Yg7i2rtQR0HT0GN=$$jXexha)4z-m!*s>$L` z?-X(9)6TQSBwr`kx9Air(XBZ_iM6}&n2_|f^+6d$94HEHW%eu;O+#Jng6+npc^4W1Fw|t#S;X_HWo6Cp;X$QZ zoAc)3G(LwI`NARa?fl&8FPg(^-D0+%_Jie-v5G9@XMz&9C=y;yd`jhq-tE__i_%4A zHQDN~c`+Nk>wPsB(9dyFlaeIOJ}d}|9KF{94gWWcOj6_3b*(?fDrlcB%Ly#4t>V(r zW+)C(7|)w)$tzY*@9eFT`D`$v$VX(O9V!TrH9LK#TO&?<@cE%q;k8LR(GPS{Jdmxml)NoL#lFs$|HU#g$w|NkglD#h26~dyZtO+jD1KI&cCC@hIHV|=TK*6eYw0AUx;$r1-2(4({6Hd^+~t}ygi6sCiY z4|3cdlRPrKm&~<1K41p3MSaf;)SDkmiw~GK+4kHN_I_$99V7Gko-$(!Q?ufc@V=7w zy?F3o2Xh@6tq9iFoyJwR_v|10L@(?|eb|VEwMM_;NUn19B^r_!BvHpD+M}%aX94e<-Q>D@55-6kG$#gR&4$&VthuOEZ>F*# zi(P*E01}fS;ZRtdmO9e1{e_>Jy_SM|Ok52HHtQ0ExiZUAQ%ScrAsxT`g}(?Ru_@lX z2|sR7DIR>T{T{H;ff(2MS0xo7S>lP3X7wfjS%Op&135*-BZy$VH-%4~D zhgX^8*if=2V3*DWE?K`4I3L_5P}TE@QMsnxm|ntcoOh(@fw0Py(#b7i0qkeDjQoyy z4LxBbpU=0JYs^Qqu|p*J8hJ;vso3_q=z3OdC}a)ukTQ}_rUVH)JEt_VOnTE%=@X62L2pX#K3rjM#v&!rlKUD z_tO$TN+AlAl^{D-_Db=CN}s8KY`=2^BDC8?%#g19kcMBNegd)hU;RFpe)Bx^v7WX0 z>sM@yAW%Urznk7<>kcz-O$r%l+nSW*`cQa3)2GfD_XA<;It zFuK&d5<}Eae8Uz!ml%SpJ8btlwFtK(_)Him<1n`8KrU<4RQg6q|XoYvyC7!f&?f4HDdWhw0MjCv0QJ0pC)#u?|o0bPU_gkoYF1MM5qREd1qlH zdwK6<@|L9!eS~AA$k<)LihT%i_%dlB<9n#j9lRVX46owPo0I?2pSxlWFbN~F&r1??0jPRSeWoV5 zx;QfEwL03my?NgmBVU}$t0>Xd_Aq?^y}Ud*)Hm!#{nl`3S&Hn>tYDzJ)4F#`FmQ)% z7$t0}e<8iS=je`Z|@n~~^* zvIIOcHM<Zoi23S~BsA{M?@_5Z z^s;~W#M1tjvmNSy@<*qGKRRPZB?bAlRDSdjkR1QK+GR^0;5$zv-0|GMafr>I1XZJh zlN2Su-gWFXM|LT*GCLKDJ=j{9*oh5Em3WJa&QBgozg%3;M(fJ$c@PnO{koLV;hGpk zhU9d4ksq}7clVB1s0HrUpN$%NFnw5aRDog~nVclxr1r2sIE1vThBR_)Bf6(m+TI76 z+{H?u-m%&ZUX$HDaO_3+?C7 z6)~*iiK6F50!|?sci)qdLbXgV)WZW@R5Dh(-${i3F{7}$I1vhQt@VnF2W9fUyP^&{ zm?vB_+4-{!VI(n-S;5A)3y%lRMy9{+=_j8*WEsL`wntM<$sR@`G}$`rkRE=1f!gZ{ zC-*~%e^h*T*Nwy=dq9@~o5*oY(^C*3Ts_`*r(qCeh-)K~8wj+0F|1b14b0_8k-V=? ztvGFAbOilfIHJm!*HF-lb5jiX)kp;OwSURIJrO)%d9*UthB@c4BZLP}#}4hby?R*wwgn?g7r8>wY2#%f52?|gT6 zN%4xDN9e@Im@N8|6Osc}6`b0d$Qs~LEla}{kFtpBd%!lge%Jc>W&PC+PEQ)OvAo)2 zZIi~PJZCFH%6(8~q2|)twJ;*q5Pau<{Bhbfh(KkO*=r^Np-I;4evWMgBpo^EGr^l& z=UKUe5DEf?{B~bI-)mJm-7U&+8`*`6Q3`~zx|+QMBuM4n9kmnh$O}5szEPjmr-&dFMkTznAdnWk7>X!J{Q(!OPI>ExcqO#oul2)`)s02f|Ao~Q>Q@_ zp--Oez48I#WJVJ^DlYd1k|sepe6K0zhN{pRyD~gYzUWgM9nxY74aOebE#2o}a>HoM6Qw&T|U(J9qv!jhSJ1ze<$)wgq#o5*%L% z%|QYuT;}MTv}N%SQ>vi(j~rf$bZSX$!E7!r)jRlNx%j$4_mJU^zjdy7&h3S(cX*;< zW1nM%)#w@gu_aO3w9v-ibR`yHTmo@qiuP9hEd=qGVs!-9vG3U7VAUjD(G6Xow_$wW zX1{qI4_W{{4`zxGY4GBN`ycw9cm^)5TvbZXUMY)TRHB(;8NRQIgvA;!Z5*$xUmqW) zNoEVK24!avblOprKq*RbF0nL6{T$7^OH(xIph8Wa{4-HDY|=GG%_ZoC6C{WCB&_Z^=$ zr5^G>$90>sO~%CWJqpE`@`_k&wCE;a*G%$e8?+_s37EU;XG0lC+270kMjsfiR4#v$ z-ZmAZGXm`Z%@7T?JUT-hO;U2KohscsvHoTM87eOYeF_?n5``uD72{b+_yNi$&CU&o$^F#jlXsMP7`h+iK-vtuN{zjq z7=*zaae*7bz$ie-nEsWk6P-vH*Sio`*;4nrC}G8Rx0Vt9eg88-gk+cKPK4qM*2#MRN5Rg)+zR&P W|5u<91aBi10P-@*(iM`%f&T+pt459h literal 0 HcmV?d00001 From 330f2d7c9ed9dff06a0eb1fc626212b6c1fd57a7 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 13 Aug 2015 15:43:58 -0300 Subject: [PATCH 128/158] update manifest --- browser-extensions/chrome/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser-extensions/chrome/manifest.json b/browser-extensions/chrome/manifest.json index d5361b40e..c628f0073 100644 --- a/browser-extensions/chrome/manifest.json +++ b/browser-extensions/chrome/manifest.json @@ -14,6 +14,6 @@ } }, "icons": { - "128": "img/icons/icon.png" + "128": "img/icons/icon-chrome-128.png" } } From 9d2a6614c8704cd90d9ccaf030f4a20497c662ed Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Aug 2015 16:21:03 -0300 Subject: [PATCH 129/158] Updates po files --- i18n/docs/appstore_de.txt | 2 +- i18n/docs/updateinfo_el.txt | 10 +- i18n/docs/updateinfo_es.txt | 10 +- i18n/docs/updateinfo_fr.txt | 12 +- i18n/docs/updateinfo_ja.txt | 10 +- i18n/docs/updateinfo_ko.txt | 10 +- i18n/docs/updateinfo_tr.txt | 10 +- i18n/po/de.po | 341 ++++++++++++++++++++++++++--------- i18n/po/el.po | 333 ++++++++++++++++++++++++++-------- i18n/po/es.po | 323 +++++++++++++++++++++++++-------- i18n/po/fr.po | 349 +++++++++++++++++++++++++++--------- i18n/po/it.po | 333 ++++++++++++++++++++++++++-------- i18n/po/ja.po | 333 ++++++++++++++++++++++++++-------- i18n/po/pt.po | 329 +++++++++++++++++++++++++-------- i18n/po/ru.po | 192 +++++++++++++++----- 15 files changed, 1977 insertions(+), 620 deletions(-) diff --git a/i18n/docs/appstore_de.txt b/i18n/docs/appstore_de.txt index 5cc3453f1..c65e43e35 100644 --- a/i18n/docs/appstore_de.txt +++ b/i18n/docs/appstore_de.txt @@ -1,4 +1,4 @@ -Sichere Bitcoins zu eigenen Bedingungen, mit einem quelloffenen Gemeinschaftswallet(elektronische Brieftasche mit Mehrfachunterschriften) von BitPay. +Sichere Bitcoins zu eigenen Bedingungen, mit einem quelloffenen Gemeinschaftswallet (elektronische Brieftasche mit Mehrfachunterschriften) von BitPay. Copay Nutzer können ihre Beträge individuell speichern oder ihre Finanzen mit anderen Nutzern in Gemeinschaftswallets teilen, die je nach Einstellung mehrere Bestätigungen (elektronische Unterschriften) benötigen und so nichtautorisierte Zahlungen verhindern. Ein paar Einsatzmöglichkeiten, wie ein solches Wallet mit anderen Copayern genutzt werden kann: Ansparen von Beträgen für Urlaub oder gemeinsame Anschaffungen (z.B. mit Freunden) diff --git a/i18n/docs/updateinfo_el.txt b/i18n/docs/updateinfo_el.txt index a42d506ce..9e57216d8 100644 --- a/i18n/docs/updateinfo_el.txt +++ b/i18n/docs/updateinfo_el.txt @@ -1,7 +1,5 @@ -* Τώρα είναι δυνατό να κάνετε αντίγραφα ασφαλείας, χωρίς δυνατότητες ψηφιακής υπογραφής (για περισσότερες πληροφορίες δείτε εδώ https://github.com/bitpay/copay/pull/2998) -* Βελτίωση των κανόνων ανανέωσης και της διαλογής στο ιστορικό συναλλαγών -* Καλύτερη διαχείριση των `λανθασμένων` συναλλαγών στο ιστορικό -* Καλύτερη διαχείριση των πορτοφολιών με 1000+ συναλλαγές στο ιστορικό τους -* Εξάγει τα αρχεία .csv με αναγνωριστικό συναλλαγής -* Καλύτερη πολιτική επιλογής αξόδευτων συναλλαγών +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Added advanced sending options +* Added Italian, Russian, and Greek language options * Μικρές διορθώσεις σφαλμάτων diff --git a/i18n/docs/updateinfo_es.txt b/i18n/docs/updateinfo_es.txt index 7153b25b8..05c8a50ae 100644 --- a/i18n/docs/updateinfo_es.txt +++ b/i18n/docs/updateinfo_es.txt @@ -1,7 +1,5 @@ -* Copias de seguridad sin capacidad de firmar transacciones (más información https://github.com/bitpay/copay/pull/2998) -* Mejor reglas de orden y actualización en la historia de transacción -* Mejor manejo de transacciones no válidas -* Mejor manejo de monederos con 1K+ transacciones -* Exporta archivos .csv con el ID de transacción -* Mejor política de selección de UTXOs +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Opciones de envío avanzado +* Nuevos idiomas: Italiano, Ruso, and Griego * Corrección de errores menores diff --git a/i18n/docs/updateinfo_fr.txt b/i18n/docs/updateinfo_fr.txt index 4aaf51127..d6e6fbad1 100644 --- a/i18n/docs/updateinfo_fr.txt +++ b/i18n/docs/updateinfo_fr.txt @@ -1,7 +1,5 @@ -• Il est maintenant possible de faire des sauvegardes sans les capacités de signature (plus d'informations sur https://github.com/bitpay/copay/pull/2998) -• Meilleures règles d'actualisation et de tri dans l'historique des transactions -• Meilleure prise en charge des transactions 'invalides' dans l'historique -• Meilleure prise en charge des portefeuilles avec plus de 1000 transactions dans l'historique -• Exportez les fichiers .csv avec un ID de transaction -• Meilleures politiques de sélection des UTXO -• Corrections de bugs mineurs +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Ajout d'options d'envois avancés +* Ajout de langues : Italien, Russe et Grec +* Corrections de bugs mineurs diff --git a/i18n/docs/updateinfo_ja.txt b/i18n/docs/updateinfo_ja.txt index 53834a107..3ccbee5fe 100644 --- a/i18n/docs/updateinfo_ja.txt +++ b/i18n/docs/updateinfo_ja.txt @@ -1,7 +1,5 @@ -■ 署名のできない、送金の提案のみできる閲覧専用のバックアップが作成できます。(詳細 https://github.com/bitpay/copay/pull/2998) -■ 取引履歴のソートとページ更新の品質向上 -■ 「無効」な取引の処理改善 -■ 1000個以上の取引履歴のあるウォレットの処理改善 -■ 取引のCSV出力可能 -■ 未使用出力(utxo)の選択ロジックの改善 +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +■ 詳細な送金設定の追加 +■ イタリア語、ロシア語、ギリシャ語の言語選択を追加 ■ バグの修正 diff --git a/i18n/docs/updateinfo_ko.txt b/i18n/docs/updateinfo_ko.txt index 250e40459..b656af4fd 100644 --- a/i18n/docs/updateinfo_ko.txt +++ b/i18n/docs/updateinfo_ko.txt @@ -1,7 +1,5 @@ -서명 기능과 관계 없는 백업 생성이 가능합니다. (https://github.com/bitpay/copay/pull/2998 더 많은 정보) -* 트랜잭션 기록의 더 나은 새로고침 및 정렬 -* 기록에서의 더 나은 '무효' 거래 처리 -* 1천회가 넘는 지갑의 기록 처리 향상 -트랜잭션 ID를 이용한 .csv 파일 내보내기 -* 더 나은 UXTO 선택 정책 +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Added advanced sending options +* Added Italian, Russian, and Greek language options 자잘한 버그 수정 diff --git a/i18n/docs/updateinfo_tr.txt b/i18n/docs/updateinfo_tr.txt index 50387207c..ed9f8aa09 100644 --- a/i18n/docs/updateinfo_tr.txt +++ b/i18n/docs/updateinfo_tr.txt @@ -1,7 +1,5 @@ -*Artık imza özelliği olmadan yedek almak mümkün (daha fazla bilgi için https://github.com/bitpay/copay/pull/2998) -*İşlem geçmişinde daha iyi yenileme ve sıralama kuralları -*Geçmişteki `geçersiz` işlemleri daha iyi kullanma -*Geçmişte 1K+ fazla işlemlerin olduğu cüzdanlara daha iyi kullanım -*İşlem kimliği ile .csv dosyalarını çıkarma -*Daha iyi UTXO seçim ilkeleri +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Added advanced sending options +* Added Italian, Russian, and Greek language options *Küçük hata düzeltmeleri diff --git a/i18n/po/de.po b/i18n/po/de.po index f1d6c22d9..907f2966c 100644 --- a/i18n/po/de.po +++ b/i18n/po/de.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: German\n" "Language: de\n" -"PO-Revision-Date: 2015-07-23 11:32-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -39,6 +39,9 @@ msgid "About Copay" msgstr "Über Copay" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "Akzeptieren" @@ -56,6 +59,10 @@ msgstr "Adresse" msgid "Advanced" msgstr "Erweitert" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Advanced Send" + #: public/views/disclaimer.html msgid "Agree" msgstr "Zustimmen" @@ -64,6 +71,10 @@ msgstr "Zustimmen" msgid "Alias for {{index.walletName}}" msgstr "Alias für {{index.walletName}}" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "Existiert bereits ein Wallet?" @@ -74,11 +85,15 @@ msgstr "Alternative Währung" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "Betrag" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Amount below dust threshold" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -97,6 +112,11 @@ msgstr "Soll das Wallet wirklich gelöscht werden?" msgid "Available Balance" msgstr "Verfügbarer Gesamtbetrag" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Average confirmation time: {{fee.nbBlocks * 10}} minutes" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -124,6 +144,10 @@ msgstr "Jetzt sichern" msgid "Backup options" msgstr "Sicherungseinstellungen" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Bad wallet invitation" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "Bevor Beträge empfangen werden, wird dringend empfohlen die Wallet Schlüssel zu sichern." @@ -141,8 +165,8 @@ msgid "Bitcoin address" msgstr "Bitcoinadresse" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -170,9 +194,17 @@ msgstr "ABBRUCH" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "Abbruch" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Cannot join the same wallet more that once" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "Zertifiziert von" @@ -181,19 +213,16 @@ msgstr "Zertifiziert von" msgid "Changing wallet alias only affects the local wallet name." msgstr "Änderung der Aliases hat nur Auswirkungen auf den lokalen Namen des Wallets" -#: src/js/controllers/walletHome.js -msgid "Check you connection and try again" -msgstr "Bitte die Verbindung prüfen und erneut probieren" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "Bitte eine Sicherungsdatei vom Computer wählen" #: public/views/modals/wallets.html msgid "Choose a wallet to send funds" -msgstr "Choose a wallet to send funds" +msgstr "Wählen Sie eine Zahlungsmethode, um Geld zu senden" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -210,14 +239,42 @@ msgstr "Farbe" msgid "Commit hash" msgstr "Hash übertragen" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Bestätigen" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "Bestätigungen" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer already in this wallet" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer already registered" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Copayer already voted on this spend proposal" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Copayer data mismatch" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "Copayers" +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "In Zwischenablage kopiert" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "Sicherung an einen sicheren Ort kopieren" @@ -231,20 +288,20 @@ msgid "Copy to clipboard" msgstr "In die Zwischenablage kopieren" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" -msgstr "Zahlung konnte nicht angenommen werden. Bitte die Verbindung überprüfen und erneut versuchen" +msgid "Could not accept payment" +msgstr "Could not accept payment" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Could not access Wallet Service: Not found" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" -msgstr "Zahlung kann nicht übermittelt werden. Bitte die Verbindung prüfen und erneut probieren" +msgid "Could not broadcast payment" +msgstr "Could not broadcast payment" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" -msgstr "Es kann keine Adresse erzeugt werden. Bitte Verbindung prüfen und erneut versuchen" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Could not create address" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -259,8 +316,8 @@ msgid "Could not decrypt file, check your password" msgstr "Datei kann nicht entschlüsselt werden, bitte das Passwort überprüfen" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "Die Zahlungsanweisung kann nicht gelöscht werden. Bitte Verbindung prüfen und erneut probieren" +msgid "Could not delete payment proposal" +msgstr "Could not delete payment proposal" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -278,23 +335,23 @@ msgstr "Import nicht möglich. Bitte Datei und Passwort überprüfen" msgid "Could not join using the specified extended private key" msgstr "Teilnahme mit spezifizierten erweiterten privaten Schlüssel nicht möglich" -#: src/js/controllers/join.js -msgid "Could not join wallet:" -msgstr "Beteiligung am Wallet nicht möglich" +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Could not join wallet" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Es konnte kein gültiger Bitcoin-QR-Code erkannt werden," #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" -msgstr "Zahlung kann nicht abgelehnt werden. Bitte Verbindung prüfen und erneut versuchen" +msgid "Could not reject payment" +msgstr "Could not reject payment" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "Zahlung kann nicht gesendet werden" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "Wallet kann nicht aktualisiert werden" @@ -331,6 +388,11 @@ msgstr "Wallet erstellen..." msgid "Creating transaction" msgstr "Transaktion erstellen" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" + #: public/views/modals/tx-details.html msgid "Date" msgstr "Datum" @@ -370,6 +432,10 @@ msgstr "Deaktiviert" msgid "Do not include private key in backup" msgstr "Keine privaten Schlüssel zur Sicherung hinzufügen" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Wird deine Sprache auf Crowdin nicht angezeigt? Kontaktiere den Support von Crowdin, denn wir würden deine Sprache gerne hinzufügen." + #: public/views/walletHome.html msgid "Download CSV file" msgstr "CSV-Datei herunterladen" @@ -378,22 +444,14 @@ msgstr "CSV-Datei herunterladen" msgid "Download backup" msgstr "Download der Sicherung " -#: public/views/includes/password.html -msgid "ENTER" -msgstr "ENTER" - -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Economy" -msgstr "Economy" +msgstr "Wirtschaft" #: public/views/preferences.html msgid "Email Notifications" msgstr "Benachrichtigunen per E-Mail" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "Emergency" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Verschlüsselung des privaten Schlüssels" @@ -402,22 +460,18 @@ msgstr "Verschlüsselung des privaten Schlüssels" msgid "Encrypted backup file saved" msgstr "Verschlüsselte Sicherungsdatei wurde gespeichert" -#: src/js/controllers/index.js -msgid "English" -msgstr "Englisch" - #: public/views/includes/password.html msgid "Enter your password" msgstr "Passwort eingeben" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error at Wallet Service" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "Fehler beim Erstellen des Wallets" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "Fehler beim Erstellen des Wallets. Bitte die Internetverbindung prüfen" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "Fehler beim Import des Wallets" @@ -429,7 +483,7 @@ msgstr "Gültig bis" #: public/views/backup.html msgid "Failed to create backup" -msgstr "Failed to create backup" +msgstr "Fehler beim Erstellen der Sicherung" #: src/js/controllers/importLegacy.js msgid "Failed to import wallets" @@ -444,15 +498,27 @@ msgstr "Familienurlaub" msgid "Fee" msgstr "Gebühr" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Fee Policy" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" msgstr "Zahlungsinformationen abrufen" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "Français" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Funds are locked by pending spend proposals" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "Beträge empfangen" @@ -463,7 +529,7 @@ msgstr "JETZT STARTEN" #: public/views/modals/customized-amount.html msgid "Generate QR Code" -msgstr "Generate QR Code" +msgstr "QR-Code generieren" #: public/views/walletHome.html msgid "Generate new address" @@ -473,7 +539,7 @@ msgstr "Neue Adresse erzeugen" msgid "Generating .csv file..." msgstr "CSV-Datei erzeugen..." -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "Deutsch" @@ -489,7 +555,7 @@ msgstr "Globale Einstellungen" msgid "Go back" msgstr "Zurück" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "Griechisch" @@ -500,8 +566,9 @@ msgstr "Ist eine Copay v0.9 Sicherung vorhanden" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" -msgstr "Erweiterte Optionen ausblenden" +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" #: src/js/controllers/index.js msgid "History" @@ -522,7 +589,7 @@ msgstr "Sofern nicht angegeben, wird ein sicherer Schlüssel erzeugt " #: public/views/importLegacy.html msgid "Import" -msgstr "Import" +msgstr "Importien" #: public/views/import.html #: public/views/splash.html @@ -549,15 +616,35 @@ msgstr "Wallet wird importiert..." msgid "Importing..." msgstr "Importiere..." +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Incorrect address network" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Insufficient funds" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Insufficient funds for fee" + #: public/views/walletHome.html msgid "Invalid" -msgstr "Invalid" +msgstr "Ungültig" -#: src/js/controllers/index.js +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Invalid address" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitation to share a Copay Wallet" + +#: public/views/translators.html msgid "Italian" msgstr "Italienisch" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "日本語" @@ -570,6 +657,10 @@ msgstr "Sascha" msgid "Join" msgstr "Teilnehmen" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" + #: public/views/add.html msgid "Join shared wallet" msgstr "Gemeinschaftliches Wallet" @@ -586,6 +677,14 @@ msgstr "Sprache" msgid "Learn more about Wallet Migration" msgstr "Mehr über die Migration von Wallets erfahren" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effect. Please wait to create a new spend proposal" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effect. Please wait to remove this spend proposal" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "Sende eine Zahlung an" @@ -634,14 +733,14 @@ msgstr "Eigene Bitcoinadresse" msgid "Network" msgstr "Netzwerk" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Network connection error" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "Neue Zahlungsvorschlag" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "Nein" - #: public/views/walletHome.html msgid "No Private key" msgstr "Kein privater Schlüssel" @@ -650,21 +749,30 @@ msgstr "Kein privater Schlüssel" msgid "No transactions yet" msgstr "Noch keine Transaktionen" -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Normal" msgstr "Normal" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Not authorized" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" msgstr "Nicht gültig" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Note" msgstr "Notiz" +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "Okay" @@ -768,6 +876,10 @@ msgstr "Zahlung gesendet!" msgid "Payment to" msgstr "Zahlung an" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "Wallet dauerhaft löschen. DIESE AKTION KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN" @@ -781,11 +893,15 @@ msgstr "Persönliches Wallet" msgid "Please enter the required fields" msgstr "Bitte die benötigten Felder ausfüllen" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Please upgrade Copay to perform this action" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "Bitte die Sicherungsdatei wählen" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" msgstr "Português" @@ -793,9 +909,13 @@ msgstr "Português" msgid "Preferences" msgstr "Einstellungen" -#: src/js/controllers/preferencesFee.js +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Backup wird vorbereitet..." + +#: src/js/services/feeService.js msgid "Priority" -msgstr "Priority" +msgstr "Priorität" #: public/views/modals/customized-amount.html msgid "QR Code" @@ -813,6 +933,11 @@ msgstr "Empfangen" msgid "Received" msgstr "Empfangen" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Empfänger" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "Neuverbindung zum Wallet Service... " @@ -856,6 +981,10 @@ msgstr "Benötigt" msgid "Retrying..." msgstr "Neuer Versuch..." +#: public/views/translators.html +msgid "Russian" +msgstr "Russian" + #: public/views/includes/password.html msgid "SET" msgstr "EINRICHTEN" @@ -972,8 +1101,13 @@ msgstr "Wallet teilen" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" -msgstr "Erweiterte Optionen anzeigen" +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejected by server" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -983,10 +1117,18 @@ msgstr "Zahlung unterschreiben" msgid "Signing transaction" msgstr "Transaktion unterschreiben" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "Español" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Spend proposal is not accepted" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Spend proposal not found" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1011,16 +1153,16 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "Die Zahlung wurde erzeugt, kann aber nicht abgeschlossen werden. Bitte erneut über die Startseite versuchen" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." -msgstr "Die Zahlung wurde erzeugt, kann aber nicht unterschrieben werden. Bitte erneut über die Startseite versuchen" +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "The payment was created but could not be signed. Please try again from home screen" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "Die Zahlung wurde vom Ersteller entfernt" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." -msgstr "Die Zahlung wurde unterschrieben, kann aber nicht übertragen werden. Bitte erneut über die Startseite versuchen" +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1030,6 +1172,10 @@ msgstr "Der private Schlüssel für dieses Wallet ist verschlüsselt. Ein Export msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "The spend proposal is not pending" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1056,12 +1202,17 @@ msgid "Time" msgstr "Zeit" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "Zu" +#: public/views/includes/output.html +msgid "Total" +msgstr "Gesamtsumme" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "Ingesamt gesperrter Gesamtsaldo" @@ -1070,6 +1221,18 @@ msgstr "Ingesamt gesperrter Gesamtsaldo" msgid "Transaction" msgstr "Transaktion" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction already broadcasted" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Danksagung an die Übersetzer" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Übersetzer" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "Transaktionsvorschlag kann nicht gesendet werden" @@ -1095,6 +1258,11 @@ msgstr "Nicht Vertrauenswürdig" msgid "Updating Wallet..." msgstr "Wallet aktualisieren..." +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + #: public/views/preferencesAbout.html msgid "Version" msgstr "Version" @@ -1139,6 +1307,7 @@ msgstr "Wallet Einladung" msgid "Wallet Invitation is not valid!" msgstr "Wallet Einladung nicht gültig!" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "Wallet exstiert bereits" @@ -1147,18 +1316,34 @@ msgstr "Wallet exstiert bereits" msgid "Wallet incomplete and broken" msgstr "Wallet unvollständig oder defekt" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Wallet is full" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Wallet is not complete" + #: public/views/create.html msgid "Wallet name" msgstr "Name des Wallets" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "Wallet service timed out. Check your Internet connection and your wallet service configuration." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Wallet not found" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet service not found" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "Warnung!" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Warning: this transaction has unconfirmed inputs" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "Falsches Passwort" @@ -1219,10 +1404,6 @@ msgstr "Einstellungen" msgid "too long!" msgstr "zu lang!" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "{{fee.value}} Bits pro kB" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} will be discounted for bitcoin networking fees" diff --git a/i18n/po/el.po b/i18n/po/el.po index 81fd45f46..5fff2d04a 100644 --- a/i18n/po/el.po +++ b/i18n/po/el.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Greek\n" "Language: el\n" -"PO-Revision-Date: 2015-07-23 11:32-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -39,6 +39,9 @@ msgid "About Copay" msgstr "Σχετικά με το Copay" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "Αποδοχή" @@ -56,6 +59,10 @@ msgstr "Διεύθυνση" msgid "Advanced" msgstr "Για προχωρημένους" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Advanced Send" + #: public/views/disclaimer.html msgid "Agree" msgstr "Συμφωνώ" @@ -64,6 +71,10 @@ msgstr "Συμφωνώ" msgid "Alias for {{index.walletName}}" msgstr "Ψευδώνυμο για {{index.walletName}}" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "Έχετε ήδη πορτοφόλι?" @@ -74,11 +85,15 @@ msgstr "Εναλλακτικό Νόμισμα" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "Ποσό" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Amount below dust threshold" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -97,6 +112,11 @@ msgstr "Είσαι σίγουρος ότι θέλετε να διαγράψετ msgid "Available Balance" msgstr "Διαθέσιμο Υπόλοιπο" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Average confirmation time: {{fee.nbBlocks * 10}} minutes" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -124,6 +144,10 @@ msgstr "Πάρτε Αντίγραφο Ασφαλείας τώρα" msgid "Backup options" msgstr "Επιλογές Αντιγράφου Ασφαλείας" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Bad wallet invitation" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "Πρίν λάβετε χρήματα, προτέινεται ισχυρά να πάρετε αντίγραφο ασφαλείας των κλειδιών του πορτοφολιού σας." @@ -141,8 +165,8 @@ msgid "Bitcoin address" msgstr "Διεύθυνση Bitcoin" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "Οι συναλλαγές με Bitcoin μπορεί να περιλαμβάνουν αμοιβή η οποία συλλέγεται απο τον εξορυκτή στο δίκτυο. Όσο μεγαλύτερη η αμοιβή τόσο μεγαλύτερο το κίνητρο του εξορυκτή να συμπεριλάβει την συναλλαγή στο μπλόκ των συναλλαγών. Το 'Επείγον' επίπεδο πρέπει να χρησιμοποιείται μόνο όταν υπάρχει συμφόρηση του δικτύου." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -170,9 +194,17 @@ msgstr "ΑΚΥΡΟ" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "Άκυρο" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Cannot join the same wallet more that once" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "Πιστοποιήθηκε από" @@ -181,10 +213,6 @@ msgstr "Πιστοποιήθηκε από" msgid "Changing wallet alias only affects the local wallet name." msgstr "Αλλάζοντας το ψευδώνυμο του πορτοφολιού επηρεάζει μόνο το τοπικό όνομα πορτοφολιού." -#: src/js/controllers/walletHome.js -msgid "Check you connection and try again" -msgstr "Ελέγξτε την συνδεσή σας και προσπαθήστε ξανά" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "Επιλέξτε ένα αντίγραφο ασφαλείας απο τον υπολογιστή σας" @@ -194,6 +222,7 @@ msgid "Choose a wallet to send funds" msgstr "Επιλέξτε ένα πορτοφόλι για να στείλετε χρήματα" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -210,14 +239,42 @@ msgstr "Χρώμα" msgid "Commit hash" msgstr "Δέσμευση λύσης" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Confirm" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "Επιβεβαιώσεις" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer already in this wallet" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer already registered" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Copayer already voted on this spend proposal" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Copayer data mismatch" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "Μέλη του πορτοφολιού Copay" +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copied to clipboard" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "Αποθηκεύστε το αντίγραφο ασφαλείας σε ασφαλές μέρος" @@ -231,20 +288,20 @@ msgid "Copy to clipboard" msgstr "Αντιγραφή στο πρόχειρο" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" -msgstr "Η πληρωμή δεν έγινε αποδεκτή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" +msgid "Could not accept payment" +msgstr "Could not accept payment" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Could not access Wallet Service: Not found" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" -msgstr "Δεν μπορεί να αποσταλεί η πληρωμή. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" +msgid "Could not broadcast payment" +msgstr "Could not broadcast payment" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "Δεν είναι δυνατή η σύνδεση στην υπηρεσία του πορτοφολιού. Ελέγξτε τη σύνδεσή σας και τη ρύθμιση παραμέτρων της υπηρεσίας του πορτοφολίου." - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" -msgstr "Δεν είναι δυνατή η δημιουργία διεύθυνσης. Ελέγξτε τη σύνδεσή σας και προσπαθήστε ξανά" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Could not create address" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -259,8 +316,8 @@ msgid "Could not decrypt file, check your password" msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση του αρχείου, ελέγξτε τον κωδικό σας" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "Δεν ήταν δυνατή η διαγραφή της πρότασης πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" +msgid "Could not delete payment proposal" +msgstr "Could not delete payment proposal" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -278,23 +335,23 @@ msgstr "Δεν ήταν δυνατή η εισαγωγή. Ελέγξτε το α msgid "Could not join using the specified extended private key" msgstr "Δεν μπορείτε να συμμετέχετε χρησιμοποιώντας το συγκεκριμένο ιδιωτικό κλειδί επέκτασης" -#: src/js/controllers/join.js -msgid "Could not join wallet:" -msgstr "Δεν μπορείτε να συμμετάσχετε στο πορτοφόλι:" +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Could not join wallet" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Δεν ήταν δυνατή η αναγνώριση ενός έγκυρου κωδικού QR για Βitcoin" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" -msgstr "Δεν είναι δυνατή η απόρριψη της πληρωμής. Ελέγξτε τη σύνδεση σας και προσπαθήστε ξανά" +msgid "Could not reject payment" +msgstr "Could not reject payment" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "Δεν είναι δυνατή η αποστολή της πληρωμής" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "Δεν ήταν δυνατή η ενημέρωση του πορτοφολιού" @@ -331,6 +388,11 @@ msgstr "Δημιουργία του Πορτοφολιού..." msgid "Creating transaction" msgstr "Δημιουργία συναλλαγής" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" + #: public/views/modals/tx-details.html msgid "Date" msgstr "Ημερομηνία" @@ -370,6 +432,10 @@ msgstr "Απενεργοποιημένο" msgid "Do not include private key in backup" msgstr "Μην συμπεριλάβετε το ιδιωτικό κλειδί στο αντίγραφο ασφαλείας" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." + #: public/views/walletHome.html msgid "Download CSV file" msgstr "Κατεβάστε το αρχείο CSV" @@ -378,22 +444,14 @@ msgstr "Κατεβάστε το αρχείο CSV" msgid "Download backup" msgstr "Λήψη αντιγράφου ασφαλείας" -#: public/views/includes/password.html -msgid "ENTER" -msgstr "ΕΙΣΑΓΕΤΕ" - -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Economy" -msgstr "Οικονομία" +msgstr "Economy" #: public/views/preferences.html msgid "Email Notifications" msgstr "Ειδοποιήσεις Email" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "Έκτακτη Ανάγκη" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Κρυπτογράφηση ιδιωτικού κλειδιού" @@ -402,22 +460,18 @@ msgstr "Κρυπτογράφηση ιδιωτικού κλειδιού" msgid "Encrypted backup file saved" msgstr "Κρυπτογραφημένο αρχείο αντιγράφου ασφαλείας αποθηκεύτηκε" -#: src/js/controllers/index.js -msgid "English" -msgstr "Αγγλικά" - #: public/views/includes/password.html msgid "Enter your password" msgstr "Παρακαλώ εισάγετε τον κωδικό σας" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error at Wallet Service" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "Σφάλμα στην δημιουργία πορτοφολιού" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "Σφάλμα στην δημιουργία του πορτοφολιού. Ελέγξτε τη σύνδεσή σας στο internet" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "Σφάλμα στην εισαγωγή πορτοφολίου:" @@ -444,15 +498,27 @@ msgstr "Χρήματα διακοπών της οικογένειας" msgid "Fee" msgstr "Αμοιβή" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Fee Policy" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" msgstr "Λήψη Πληροφοριών Πληρωμής" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "Γαλλικά" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Funds are locked by pending spend proposals" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "Χρήματα ελήφθησαν" @@ -473,7 +539,7 @@ msgstr "Δημιουργία νέας διεύθυνσης" msgid "Generating .csv file..." msgstr "Δημιουργία .csv αρχείου..." -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "Γερμανικά" @@ -489,7 +555,7 @@ msgstr "Καθολικές ρυθμίσεις" msgid "Go back" msgstr "Πάμε πίσω" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "Ελληνικά" @@ -500,8 +566,9 @@ msgstr "Έχετε ένα αντίγραφο ασφαλείας από το Copa #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" -msgstr "Απόκρυψη Προχωρημένων επιλογών" +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" #: src/js/controllers/index.js msgid "History" @@ -549,15 +616,35 @@ msgstr "Εισάγεται το πορτοφόλι ..." msgid "Importing..." msgstr "Εισαγωγή ..." +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Incorrect address network" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Insufficient funds" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Insufficient funds for fee" + #: public/views/walletHome.html msgid "Invalid" msgstr "Μη έγκυρο" -#: src/js/controllers/index.js +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Invalid address" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitation to share a Copay Wallet" + +#: public/views/translators.html msgid "Italian" msgstr "Ιταλικά" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "Ιαπωνικά" @@ -570,6 +657,10 @@ msgstr "Ιωάννης" msgid "Join" msgstr "Συμμετοχή" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" + #: public/views/add.html msgid "Join shared wallet" msgstr "Συμμετοχή σε κοινόχρηστο πορτοφόλι" @@ -586,6 +677,14 @@ msgstr "Γλώσσα" msgid "Learn more about Wallet Migration" msgstr "Μάθετε περισσότερα για τη Μετανάστευση Πορτοφολιού" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effect. Please wait to create a new spend proposal" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effect. Please wait to remove this spend proposal" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "Κάντε μια πληρωμή σε" @@ -634,14 +733,14 @@ msgstr "Η διεύθυνση Bitcoin μου" msgid "Network" msgstr "Δίκτυο" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Network connection error" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "Νέα Πρόταση Πληρωμής" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "Όχι" - #: public/views/walletHome.html msgid "No Private key" msgstr "Δεν υπάρχει ιδιωτικό κλειδί" @@ -650,9 +749,13 @@ msgstr "Δεν υπάρχει ιδιωτικό κλειδί" msgid "No transactions yet" msgstr "Δεν υπάρχουν συναλλαγές ακόμα" -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Normal" -msgstr "Κανονική" +msgstr "Normal" + +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Not authorized" #: public/views/walletHome.html #: public/views/modals/customized-amount.html @@ -660,11 +763,16 @@ msgid "Not valid" msgstr "Δεν είναι έγκυρη" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Note" msgstr "Σημείωση" +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "ΕΝΤΑΞΕΙ" @@ -768,6 +876,10 @@ msgstr "Πληρωμή Εστάλη!" msgid "Payment to" msgstr "Πληρωμή σε" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "Να διαγράφεί μόνιμα αυτό το πορτοφόλι? ΑΥΤΗ Η ΕΝΕΡΓΕΙΑ ΔΕΝ ΜΠΟΡΕΙ ΝΑ ΑΝΤΙΣΤΡΑΦΕΙ" @@ -781,11 +893,15 @@ msgstr "Προσωπικό πορτοφόλι" msgid "Please enter the required fields" msgstr "Παρακαλώ εισάγετε τα απαιτούμενα πεδία" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Please upgrade Copay to perform this action" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "Παρακαλώ, επιλέξτε το αρχείο αντιγράφου ασφαλείας" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" msgstr "Πορτογαλικά" @@ -793,9 +909,13 @@ msgstr "Πορτογαλικά" msgid "Preferences" msgstr "Προτιμήσεις" -#: src/js/controllers/preferencesFee.js +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Preparing backup..." + +#: src/js/services/feeService.js msgid "Priority" -msgstr "Προτεραιότητα" +msgstr "Priority" #: public/views/modals/customized-amount.html msgid "QR Code" @@ -813,6 +933,11 @@ msgstr "Λάβετε" msgid "Received" msgstr "Ληφθέντα" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Recipients" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "Γίνεται επανασύνδεση στην Υπηρεσία Πορτοφολιού..." @@ -856,6 +981,10 @@ msgstr "Απαιτείτε" msgid "Retrying..." msgstr "Επανάληψη..." +#: public/views/translators.html +msgid "Russian" +msgstr "Russian" + #: public/views/includes/password.html msgid "SET" msgstr "Ορισμός" @@ -972,8 +1101,13 @@ msgstr "Κοινόχρηστο πορτοφόλι" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" -msgstr "Εμφάνιση προχωρημένων επιλογών" +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejected by server" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -983,10 +1117,18 @@ msgstr "Υπογραφή πληρωμής" msgid "Signing transaction" msgstr "Υπογραφή συναλλαγής" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "Ισπανικά" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Spend proposal is not accepted" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Spend proposal not found" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1011,16 +1153,16 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "Η πληρωμή δημιουργήθηκε, αλλά δεν ήταν δυνατό να ολοκληρωθεί. Παρακαλώ ξαναπροσπαθήστε από την αρχική οθόνη" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." -msgstr "Η πληρωμή δημιουργήθηκε, αλλά δεν θα μπορούσε να υπογραφεί. Παρακαλώ ξαναπροσπαθήστε από την αρχική οθόνη." +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "The payment was created but could not be signed. Please try again from home screen" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "Η πληρωμή έχει αφαιρεθεί από τον δημιουργό της" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." -msgstr "Η πληρωμή έχει υπογραφεί αλλά δεν μπορούσε να μεταδοθεί. Παρακαλώ ξαναπροσπαθήστε από την αρχική οθόνη." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1030,6 +1172,10 @@ msgstr "Το ιδιωτικό κλειδί για αυτό το πορτοφόλ msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "Το λογισμικό που πρόκειται να χρησιμοποιήσετε λειτουργεί ως ένα δωρεάν, ανοικτού κώδικα και πολλαπλών υπογραφών ψηφιακό πορτοφόλι. Το λογισμικό δεν αποτελεί ένα λογαριασμό όπου το BitPay ή άλλα τρίτα μέρη χρησιμεύουν ως ενδιάμεσοι χρηματοπιστωτικοί οργανισμοί ή θεματοφύλακες των bitcoin σας. Ενώ το λογισμικό έχει υποβληθεί σε δοκιμή beta και συνεχίζει να βελτιώνεται από χρήστες ανοικτού κώδικα και την κοινότητα των προγραμματιστών, εμείς δεν μπορούμε να εγγυηθούμε ότι δεν θα υπάρξει κανένα σφάλμα στο λογισμικό. Αναγνωρίζετε ότι η χρήση αυτού του λογισμικού είναι στην κρίση σας και σε συμφωνία με όλους τους ισχύοντες νόμους. Είστε υπεύθυνος για τη διαφύλαξή των κωδικών πρόσβασής σας, το ιδιωτικό ζεύγος κλειδιών, τετραψήφιων κωδικών PIN και οποιουσδήποτε άλλους κωδικούς που χρησιμοποιείτε για να έχετε πρόσβαση στο λογισμικό. ΕΑΝ ΧΑΣΕΤΕ ΤΗΝ ΠΡΟΣΒΑΣΗ ΝΑ ΣΑΣ ΣΤΟ ΠΟΡΤΟΦΌΛΙ COPAY Ή ΣΤΑ ΚΡΥΠΤΟΓΡΑΦΗΜΕΝΑ ΙΔΙΩΤΙΚΑ ΣΑΣ ΚΛΕΙΔΙΑ ΚΑΙ ΔΕΝ ΑΠΟΘΗΚΕΥΣΑΤΕ ΧΩΡΙΣΤΆ ΕΝΑ ΑΝΤΙΓΡΑΦΟ ΑΣΦΑΛΕΙΑΣ ΤΟΥ ΠΟΡΤΟΦΟΛΙΟΥ ΚΑΙ ΤΟΥ ΑΝΤΙΣΤΟΙΧΟΥ ΚΩΔΙΚΟΥ ΠΡΌΣΒΑΣΗΣ, ΑΠΟΔΕΧΕΣΤΕ ΚΑΙ ΣΥΜΦΩΝΕΙΤΕ ΟΤΙ ΟΠΟΙΑΔΗΠΟΤΕ ΠΟΣΟΤΗΤΑ BITCOIN ΠΟΥ ΕΧΕΤΕ ΣΥΣΧΕΤΙΣΕΙ ΜΕ ΤΟ ΠΟΡΤΟΦΟΛΙ ΤΟΥ COPAY ΘΑ ΓΙΝΟΥΝ ΑΠΡΟΣΠΕΛΑΣΤΑ. Όλες οι αιτήσεις για συναλλαγές είναι αμετάκλητες. Οι συγγραφείς του λογισμικού, οι εργαζόμενοι και οι συνεργάτες του Bitpay, οι κατόχοι πνευματικών δικαιωμάτων, και η BitPay α.ε., δεν μπορούν να ανακτήσουν ιδιωτικά κλειδιά ή τους κωδικούς πρόσβασης σας, εάν χάσετε ή ξεχασετε αυτούς και δεν μπορούν να εγγυηθούν την επιβεβαίωση της συναλλαγής, δεδομένου ότι δεν έχουν τον έλεγχο του δικτύου Bitcoin. Στο μέγιστο βαθμό που επιτρέπει το δίκαιο, το λογισμικό παρέχεται \"ως έχει\" και καμία δήλωση ή εγγύηση μπορεί να γίνει του κάθε είδους, ρητή ή σιωπηρή, συμπεριλαμβανομένων, αλλά μη περιορισμένων, των εγγυήσεων εμπορευσιμότητας, καταλληλότητας ή συγκεκριμένου σκοπού και νομιμότητας. Αναλάμβανετε κάθε κινδύνο που συνδέεται με τη χρήση του λογισμικού. Σε καμία περίπτωση οι συντάκτες του λογισμικού, οι συνεργάτες του Bitpay, οι κατόχοι πνευματικών δικαιωμάτων, ή η BitPay α.ε. ευθύνεται για οποιαδήποτε αξίωση, ζημία ή άλλη ευθύνη, είτε βαση κάποιας σύμβασης, αδικοπραξίας, ή άλλο, που προκύπτει από την σχέση σας με το λογισμικό. Διατηρούμε το δικαίωμα να τροποποιήσουμε αυτή την αποποίηση ευθυνών από καιρό σε καιρό." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "The spend proposal is not pending" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1056,12 +1202,17 @@ msgid "Time" msgstr "Ώρα" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "Προς" +#: public/views/includes/output.html +msgid "Total" +msgstr "Total" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "Συνολικό Κλειδωμένο Υπόλοιπο" @@ -1070,6 +1221,18 @@ msgstr "Συνολικό Κλειδωμένο Υπόλοιπο" msgid "Transaction" msgstr "Συναλλαγή" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction already broadcasted" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Translation Credits" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Translators" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "Δεν είναι δυνατή η αποστολή πρότασης συναλλαγής" @@ -1095,6 +1258,11 @@ msgstr "Μη αξιόπιστη" msgid "Updating Wallet..." msgstr "Ενημέρωση πορτοφολιού..." +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + #: public/views/preferencesAbout.html msgid "Version" msgstr "Έκδοση" @@ -1139,6 +1307,7 @@ msgstr "Πρόσκληση πορτοφολιού" msgid "Wallet Invitation is not valid!" msgstr "Η πρόσκληση πορτοφολιού δεν είναι έγκυρη!" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "Υπάρχει ήδη το πορτοφόλι" @@ -1147,18 +1316,34 @@ msgstr "Υπάρχει ήδη το πορτοφόλι" msgid "Wallet incomplete and broken" msgstr "Πορτοφόλι ελλιπές και χαλασμένο" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Wallet is full" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Wallet is not complete" + #: public/views/create.html msgid "Wallet name" msgstr "Όνομα πορτοφολιού" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "Η υπηρεσία πορτοφολιού έληξε. Ελέγξτε τη συνδεσή σας και τη ρύθμιση των παραμέτρων του πορτοφολιού σας." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Wallet not found" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet service not found" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "Προειδοποίηση!" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Warning: this transaction has unconfirmed inputs" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "Λάθος κωδικός πρόσβασης" @@ -1219,10 +1404,6 @@ msgstr "ρυθμίσεις" msgid "too long!" msgstr "πάρα πολύ μεγάλο μέγεθος!" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "{{fee.value}} bits ανά kB" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}}, θα προεξοφληθεί ώς τέλος του δικτύου bitcoin" diff --git a/i18n/po/es.po b/i18n/po/es.po index 9b5031801..007f595ae 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Spanish\n" "Language: es\n" -"PO-Revision-Date: 2015-07-23 11:32-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -39,6 +39,9 @@ msgid "About Copay" msgstr "Acerca de Copay" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "Aceptar" @@ -56,6 +59,10 @@ msgstr "Dirección" msgid "Advanced" msgstr "Avanzado" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Envío avanzado" + #: public/views/disclaimer.html msgid "Agree" msgstr "Aceptar" @@ -64,6 +71,10 @@ msgstr "Aceptar" msgid "Alias for {{index.walletName}}" msgstr "Alias de {{index.walletName}}" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "Todas las contribuciones a la traducción de Copay son bienvenidas. Regístrese en crowdin.com y únase al proyecto Copay en" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "¿Ya dispone de un monedero?" @@ -74,11 +85,15 @@ msgstr "Moneda Alternativa" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "Importe" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Cantidad debajo del umbral permitido" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -97,6 +112,11 @@ msgstr "¿Estas seguro de borrar este monedero?" msgid "Available Balance" msgstr "Balance disponible" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Tiempo promedio de confirmación: {{fee.nbBlocks * 10}} minutos" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -124,6 +144,10 @@ msgstr "Copia de seguridad" msgid "Backup options" msgstr "Opciones de copia de seguridad" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Invitación incorrecta al monedero" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "Antes de recibir fondos, es altamente recomendable realizar una copia de seguridad." @@ -141,8 +165,8 @@ msgid "Bitcoin address" msgstr "Dirección bitcoin" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "Las transacciones de Bitcoin pueden incluir una tasa que es recaudada por los mineros de la red. Cuanto mayor sea la tasa, mayor será el incentivo de los mineros para incluir esa transacción en un bloque. El nivel 'Emergencia' debe ser utilizado solo cuando hay una congestión en la red." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Las transacciones de Bitcoin pueden incluir una tasa colectada por los mineros en la red. Cuanto mayor sea la tasa, mayor será el incentivo para que el minero incluya esa transacción en un bloque. Las tasas reales se determinan en base a la carga de la red y a la política seleccionada." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -170,9 +194,17 @@ msgstr "CANCELAR" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "Cancelar" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "No puede unirse al mismo monedero más de una vez" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "Certificado por" @@ -181,10 +213,6 @@ msgstr "Certificado por" msgid "Changing wallet alias only affects the local wallet name." msgstr "Cambiar el alias del monedero solo afecta al nombre del monedero local." -#: src/js/controllers/walletHome.js -msgid "Check you connection and try again" -msgstr "Verifique su conexión e inténtelo nuevamente" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "Seleccione el archivo backup de su computadora" @@ -194,6 +222,7 @@ msgid "Choose a wallet to send funds" msgstr "Seleccione un monedero para enviar fondos" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -210,14 +239,42 @@ msgstr "Color" msgid "Commit hash" msgstr "Commit hash" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Confirmar" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "Confirmaciones" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Ya se encuentra en este monedero" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Ya esta registrado" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Ya ha votado en esta propuesta de gasto" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Discrepancia en los datos del Copayer" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "Copayers" +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copiado al portapapeles" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "Guardar copia de seguridad en un lugar seguro" @@ -231,20 +288,20 @@ msgid "Copy to clipboard" msgstr "Copiar al portapapeles" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" -msgstr "No se pudo aceptar el pago. Verifique su conexión e inténtelo nuevamente" +msgid "Could not accept payment" +msgstr "No se pudo aceptar el pago" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "No se pudo acceder a Wallet Service: No encontrado" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" -msgstr "No se pudo emitir el pago. Verifique su conexión e inténtelo nuevamente" +msgid "Could not broadcast payment" +msgstr "No se pudo emitir el pago" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "No se pudo conectar con Wallet Service. Verifique la conexión a internet y la configuración a Wallet Service." - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" -msgstr "No se pudo crear la dirección. Verifique su conexión e inténtelo nuevamente" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "No se pudo crear dirección" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -259,8 +316,8 @@ msgid "Could not decrypt file, check your password" msgstr "No se pudo desencriptar el archivo, verifique su contraseña" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "No se pudo eliminar la propuesta de pago. Verifique su conexión e inténtelo nuevamente" +msgid "Could not delete payment proposal" +msgstr "No se pudo eliminar la propuesta de pago" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -278,23 +335,23 @@ msgstr "No se pudo importar. Verifique el archivo y su contraseña" msgid "Could not join using the specified extended private key" msgstr "No se pudo unir al monedero usando la clave privada ingresada" -#: src/js/controllers/join.js -msgid "Could not join wallet:" -msgstr "No se pudo unir al monedero:" +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "No se pudo unir al monedero" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" msgstr "No se reconoció un código QR de Bitcoin válido" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" -msgstr "No se pudo rechazar el pago. Verifique su conexión e inténtelo nuevamente" +msgid "Could not reject payment" +msgstr "No se pudo rechazar el pago" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "No se pudo enviar el pago" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "No se puede actualizar el monedero" @@ -331,6 +388,11 @@ msgstr "Creando Monedero..." msgid "Creating transaction" msgstr "Creando transacción" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Costo actual para esta política: {{fee.feePerKBUnit}}/kiB" + #: public/views/modals/tx-details.html msgid "Date" msgstr "Fecha" @@ -370,6 +432,10 @@ msgstr "Deshabilitado" msgid "Do not include private key in backup" msgstr "No incluir la clave privada en la copia de seguridad" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "¿No ve su idioma en Crowdin? Contáctese con el encargado del proyecto! Nos encantaría soportar su idioma." + #: public/views/walletHome.html msgid "Download CSV file" msgstr "Descargar archivo CSV" @@ -378,11 +444,7 @@ msgstr "Descargar archivo CSV" msgid "Download backup" msgstr "Descargar copia de seguridad" -#: public/views/includes/password.html -msgid "ENTER" -msgstr "ENTRAR" - -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Economy" msgstr "Económico" @@ -390,10 +452,6 @@ msgstr "Económico" msgid "Email Notifications" msgstr "Notificaciones por Email" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "Emergencia" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Encriptar Clave Privada" @@ -402,22 +460,18 @@ msgstr "Encriptar Clave Privada" msgid "Encrypted backup file saved" msgstr "Archivo de copia de seguridad encriptado guardado" -#: src/js/controllers/index.js -msgid "English" -msgstr "Inglés" - #: public/views/includes/password.html msgid "Enter your password" msgstr "Escribe tu contraseña" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error en Wallet Service" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "Error al crear monedero" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "Error al crear monedero. Verifique su conexión a internet" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "Error al importar monedero: " @@ -444,15 +498,27 @@ msgstr "Fondos para vacaciones en familia" msgid "Fee" msgstr "Costo" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Política de costo" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Política de costo para esta transacción" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" msgstr "Obteniendo información del pago" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "Francés" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Los fondos están bloqueados por propuestas de gastos pendientes" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "Fondos Recibidos" @@ -473,7 +539,7 @@ msgstr "Generar nueva dirección" msgid "Generating .csv file..." msgstr "Generando archivo .csv..." -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "Alemán" @@ -489,7 +555,7 @@ msgstr "Opciones globales" msgid "Go back" msgstr "Volver" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "Griego" @@ -500,7 +566,8 @@ msgstr "¿Tiene una copia de seguridad de Copay v0.9?" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" +#: public/views/walletHome.html +msgid "Hide advanced options" msgstr "Ocultar opciones avanzadas" #: src/js/controllers/index.js @@ -549,15 +616,35 @@ msgstr "Importando monedero..." msgid "Importing..." msgstr "Importando..." +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Dirección de red incorrecta" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Fondos insuficientes" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Fondos insuficientes por el costo" + #: public/views/walletHome.html msgid "Invalid" msgstr "Inválido" -#: src/js/controllers/index.js +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Dirección inválida" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitación para compartir un monedero Copay" + +#: public/views/translators.html msgid "Italian" msgstr "Italiano" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "Japonés" @@ -570,6 +657,10 @@ msgstr "Juan" msgid "Join" msgstr "Unirse" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Únase a mi monedero Copay. Aquí esta el código de invitación: {{secret}}. Puede descargar Copay para su teléfono o computadora en https://copay.io" + #: public/views/add.html msgid "Join shared wallet" msgstr "Unirse a un monedero" @@ -586,6 +677,14 @@ msgstr "Idioma" msgid "Learn more about Wallet Migration" msgstr "Más detalles para migrar Monedero" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Bloqueo temporal. Por favor espere para crear una nueva propuesta de gasto" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Bloqueo temporal. Por favor espere para eliminar esta propuesta de gasto" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "Hacer un pago a" @@ -634,14 +733,14 @@ msgstr "Mi dirección Bitcoin" msgid "Network" msgstr "Red" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Error de conexión a la red" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "Nueva Propuesta de Pago" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "No" - #: public/views/walletHome.html msgid "No Private key" msgstr "Sin clave privada" @@ -650,21 +749,30 @@ msgstr "Sin clave privada" msgid "No transactions yet" msgstr "Sin transacciones todavía" -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Normal" msgstr "Normal" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "No autorizado" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" msgstr "No válido" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Note" msgstr "Nota" +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "LISTO" @@ -768,6 +876,10 @@ msgstr "¡Pago enviado!" msgid "Payment to" msgstr "Pago a" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pendiente a Confirmar" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "Borrar permanentemente este monedero. ESTA ACCIÓN NO PUEDE SER REVERTIDA" @@ -781,11 +893,15 @@ msgstr "Monedero Personal" msgid "Please enter the required fields" msgstr "Por favor ingrese los campos requeridos" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Por favor actualizar Copay para realizar esta acción" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "Por favor, selecciona el archivo de copia de seguridad" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" msgstr "Portugués" @@ -793,7 +909,11 @@ msgstr "Portugués" msgid "Preferences" msgstr "Preferencias" -#: src/js/controllers/preferencesFee.js +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Preparando copia de seguridad..." + +#: src/js/services/feeService.js msgid "Priority" msgstr "Prioritario" @@ -813,6 +933,11 @@ msgstr "Recibir" msgid "Received" msgstr "Recibido" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Destinatarios" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "Reconectando a Wallet Service..." @@ -856,6 +981,10 @@ msgstr "Requerido" msgid "Retrying..." msgstr "Reintentando..." +#: public/views/translators.html +msgid "Russian" +msgstr "Ruso" + #: public/views/includes/password.html msgid "SET" msgstr "ESTABLECER" @@ -972,9 +1101,14 @@ msgstr "Monedero Compartido" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" +#: public/views/walletHome.html +msgid "Show advanced options" msgstr "Mostrar opciones avanzadas" +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Firmas rechazadas por el servidor" + #: src/js/controllers/walletHome.js msgid "Signing payment" msgstr "Firmando el pago" @@ -983,10 +1117,18 @@ msgstr "Firmando el pago" msgid "Signing transaction" msgstr "Firmando transacción" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "Español" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "La propuesta de gasto no es aceptada" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Propuesta de gasto no encontrada" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1011,16 +1153,16 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "El pago fue creado pero no se pudo completar. Por favor intente nuevamente desde la pantalla de inicio." #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." -msgstr "El pago fue creado pero no pudo ser firmado. Por favor intente nuevamente desde la pantalla de inicio." +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "El pago fue creado pero no pudo ser firmado. Por favor intente nuevamente desde la pantalla de inicio" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "El pago fue eliminado por el creador" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." -msgstr "El pago fue firmado pero no pudo ser enviado. Por favor intente nuevamente desde la pantalla de inicio." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "El pago fue firmado pero no pudo ser enviado. Por favor intente nuevamente desde la pantalla de inicio" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1030,6 +1172,10 @@ msgstr "Este monedero tiene sus claves privadas encriptadas. Exportar una copia msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "El software que va a utilizar es un monedero digital de código abierto y multi-firmas. El software no constituye una cuenta donde BitPay u otras terceras partes sirven como intermediarios financieros o custodios de su bitcoin. Mientras que el software ha sido objeto de pruebas beta y continúa siendo mejorada por los comentarios de los usuarios de código abierto y la comunidad de desarrolladores, no podemos garantizar que no habrá errores en el software. Usted reconoce que el uso de este software es bajo tu propia responsabilidad y en cumplimiento con todas las leyes aplicables. Usted es responsable de la custodia de sus contraseñas, pares de claves privadas, PIN y cualquier otro código que se utiliza para acceder al software. SI UD. PIERDE ACCESO A SU MONEDERO COPAY O A SUS CLAVES PRIVADAS ENCRIPTADAS Y NO HA GUARDADO POR SEPARADO UNA COPIA DE SEGURIDAD DE SU MONEDERO Y CONTRASEÑA CORRESPONDIENTES, USTED RECONOCE Y ACEPTA QUE CUALQUIER BITCOIN QUE HA ASOCIADO CON ESE MONEDERO COPAY SERÁ INACCESIBLE. Todas las solicitudes de transacción son irreversibles. Los autores de los software, empleados y afiliados de Bitpay, los titulares de derechos de autor, y BitPay, Inc. no pueden recuperar sus claves privadas o contraseñas si se pierde o se olvida de ellos y no se puede garantizar la confirmación de la transacción, ya que no tienen control sobre la red Bitcoin. En la máxima medida permitida por la ley, este software se proporciona \"tal cual\" y no asume la responsabilidad ni ofrece garantías de ningún tipo, expresa o implícita, incluyendo, pero no limitado a las garantías comerciales, de conveniencia o a un propósito particular. Usted asume todos los riesgos asociados con el uso del software. En ningún caso los autores, empleados y afiliados de Bitpay, los titulares de derechos de autor, o BitPay, Inc. serán declarados responsables de los reclamos, daños o cualquier otra responsabilidad, ya sea en una acción de contrato, agravio o de otra manera, que surja fuera de la conexión con el software. Nos reservamos el derecho a modificar el presente aviso legal de vez en cuando.

    The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "La propuesta de gasto no esta pendiente" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1056,12 +1202,17 @@ msgid "Time" msgstr "Hora" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "Para" +#: public/views/includes/output.html +msgid "Total" +msgstr "Total" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "Balance total bloqueado" @@ -1070,6 +1221,18 @@ msgstr "Balance total bloqueado" msgid "Transaction" msgstr "Transacción" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "La transacción ya se ha enviado" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Créditos de traducción" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Traductores" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "No se puede enviar propuesta de transacción" @@ -1095,6 +1258,11 @@ msgstr "No es de confianza" msgid "Updating Wallet..." msgstr "Actualizando Monedero..." +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Utilizar los fondos sin confirmar" + #: public/views/preferencesAbout.html msgid "Version" msgstr "Versión" @@ -1139,6 +1307,7 @@ msgstr "Invitación para unirse al monedero" msgid "Wallet Invitation is not valid!" msgstr "¡Invitación no válida!" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "El monedero ya existe" @@ -1147,18 +1316,34 @@ msgstr "El monedero ya existe" msgid "Wallet incomplete and broken" msgstr "Monedero incompleto y roto" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "El monedero está lleno" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "El monedero no esta completo" + #: public/views/create.html msgid "Wallet name" msgstr "Nombre del monedero" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "Tiempo de espera agotado. Verifique la conexión a internet y la configuración a Wallet Service." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Monedero no encontrado" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet Service no encontrado" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "¡Advertencia!" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Advertencia: esta operación tiene entradas sin confirmar" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "Contraseña incorrecta" @@ -1219,10 +1404,6 @@ msgstr "configuración" msgid "too long!" msgstr "¡demasiado largo!" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "{{fee.value}} bits por kB" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} se descontarán de los costos de la red bitcoin" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index befa8c1c1..75426cd65 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: French\n" "Language: fr\n" -"PO-Revision-Date: 2015-07-23 11:32-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -20,7 +20,7 @@ msgstr "(double dépense éventuelle)" #: public/views/modals/txp-details.html msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." -msgstr "* Une proposition de transaction peut être supprimée si vous en êtes le créateur et qu'aucun des autres copayers n'a signé, ou si 24 heures sont passées depuis la création de la proposition." +msgstr "* Une proposition de paiement peut être supprimée si vous en êtes le créateur et qu'aucun des autres copayers n'a signé, ou si 24 heures sont passées depuis la création de la proposition." #: public/views/backup.html msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." @@ -39,6 +39,9 @@ msgid "About Copay" msgstr "À propos de Copay" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "Accepter" @@ -56,6 +59,10 @@ msgstr "Adresse" msgid "Advanced" msgstr "Avancés" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Envoi avancé" + #: public/views/disclaimer.html msgid "Agree" msgstr "Accepter" @@ -64,6 +71,10 @@ msgstr "Accepter" msgid "Alias for {{index.walletName}}" msgstr "Alias pour {{index.walletName}}" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "Toutes les contributions à la traduction de Copay sont les bienvenues. Inscrivez-vous sur crowdin.com et rejoignez le projet Copay sur" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "Vous avez déjà un portefeuille ?" @@ -74,11 +85,15 @@ msgstr "Devise alternative" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "Montant" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Montant en dessous du seuil minimal recommandé" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -97,6 +112,11 @@ msgstr "Êtes-vous certain de vouloir supprimer ce portefeuille ?" msgid "Available Balance" msgstr "Solde disponible" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Temps de confirmation moyen : {{fee.nbBlocks * 10}} minutes" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -124,13 +144,17 @@ msgstr "Sauvegarder" msgid "Backup options" msgstr "Options de sauvegarde" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Mauvaise invitation de portefeuille" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "Avant de recevoir des fonds, il est fortement recommandé de sauvegarder les clés de votre portefeuille." #: public/views/preferences.html msgid "Bitcoin Network Fee Policy" -msgstr "Politique des frais de réseau Bitcoin" +msgstr "Stratégie des frais de réseau Bitcoin" #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" @@ -141,8 +165,8 @@ msgid "Bitcoin address" msgstr "Adresse Bitcoin" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "Les transactions Bitcoin peuvent inclure des frais collectés par les mineurs du réseau. Plus les frais sont élevés, et plus l'incitation à inclure une transaction dans un bloc est importante pour les mineurs. La priorité \"Urgente\" ne devrait être utilisée que lorsque le réseau présente une congestion." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Les transactions Bitcoin peuvent inclure des frais prélevés par les mineurs sur le réseau. Plus les frais sont élevés, et plus un mineur sera incité à inclure cette transaction dans un bloc. Les frais actuels sont déterminés en fonction de la charge du réseau et de la stratégie sélectionnée." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -170,9 +194,17 @@ msgstr "ANNULER" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "Annuler" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Impossible de rejoindre le même portefeuille plus d'une fois" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "Certifié par" @@ -181,10 +213,6 @@ msgstr "Certifié par" msgid "Changing wallet alias only affects the local wallet name." msgstr "La modification d'un alias de portefeuille affecte uniquement le nom du portefeuille local." -#: src/js/controllers/walletHome.js -msgid "Check you connection and try again" -msgstr "Vérifiez votre connexion internet et réessayez" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "Choisissez un fichier de sauvegarde depuis votre ordinateur" @@ -194,6 +222,7 @@ msgid "Choose a wallet to send funds" msgstr "Choisissez un portefeuille pour envoyer des fonds" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -210,14 +239,42 @@ msgstr "Couleur" msgid "Commit hash" msgstr "Commit hash" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Confirmer" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "Confirmations" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer déjà dans ce portefeuille" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer déjà inscrit" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Le Copayer a déjà voté pour cette proposition de dépense" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Les données Copayer ne correspondent pas" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "Copayers" +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copié dans le presse-papier" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "Copiez la sauvegarde vers un endroit sûr" @@ -231,20 +288,20 @@ msgid "Copy to clipboard" msgstr "Copier dans le presse-papier" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" -msgstr "Impossible d'accepter le paiement. Vérifiez votre connexion internet et réessayez" +msgid "Could not accept payment" +msgstr "Impossible d'accepter le paiement" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Impossible d'accéder au Wallet Service : Introuvable" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" -msgstr "Impossible de diffuser le paiement. Vérifiez votre connexion internet et réessayez" +msgid "Could not broadcast payment" +msgstr "Impossible de diffuser le paiement" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "Impossible de se connecter au service de portefeuille. Vérifiez votre connexion Internet et la configuration de votre service de portefeuille." - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" -msgstr "Impossible de créer l'adresse. Vérifiez votre connexion internet et réessayez" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Impossible de créer l'adresse" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -259,8 +316,8 @@ msgid "Could not decrypt file, check your password" msgstr "Impossible de déchiffrer le fichier, vérifiez votre mot de passe" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "Impossible de supprimer la proposition de paiement. Vérifiez votre connexion internet et réessayez" +msgid "Could not delete payment proposal" +msgstr "Impossible de supprimer la proposition de paiement" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -278,8 +335,8 @@ msgstr "Impossible d'importer. Vérifiez le fichier d'entrée et le mot de passe msgid "Could not join using the specified extended private key" msgstr "Impossible de rejoindre en utilisant la clé privée étendue spécifiée" -#: src/js/controllers/join.js -msgid "Could not join wallet:" +#: src/js/services/profileService.js +msgid "Could not join wallet" msgstr "Impossible de rejoindre le portefeuille" #: src/js/controllers/walletHome.js @@ -287,14 +344,14 @@ msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Impossible de reconnaître un code QR Bitcoin valide" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" -msgstr "Impossible de rejeter le paiement. Vérifiez votre connexion internet réessayez" +msgid "Could not reject payment" +msgstr "Impossible de rejeter le paiement" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "Impossible d'envoyer le paiement" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "Impossible de mettre à jour le portefeuille" @@ -331,6 +388,11 @@ msgstr "Création du portefeuille..." msgid "Creating transaction" msgstr "Création de la transaction" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Frais actuels pour cette stratégie : {{fee.feePerKBUnit}}/kiB" + #: public/views/modals/tx-details.html msgid "Date" msgstr "Date" @@ -370,6 +432,10 @@ msgstr "Désactivé" msgid "Do not include private key in backup" msgstr "Ne pas inclure la clé privée dans la sauvegarde" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Vous ne voyez pas votre langue sur Crowdin ? Contactez le propriétaire sur Crowdin ! Nous serions ravis de prendre en charge votre langue." + #: public/views/walletHome.html msgid "Download CSV file" msgstr "Télécharger le fichier CSV" @@ -378,11 +444,7 @@ msgstr "Télécharger le fichier CSV" msgid "Download backup" msgstr "Télécharger la sauvegarde" -#: public/views/includes/password.html -msgid "ENTER" -msgstr "ENTRER" - -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Economy" msgstr "Économique" @@ -390,10 +452,6 @@ msgstr "Économique" msgid "Email Notifications" msgstr "Notifications e-mail" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "Urgente" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Chiffrer la clé privée" @@ -402,22 +460,18 @@ msgstr "Chiffrer la clé privée" msgid "Encrypted backup file saved" msgstr "Le fichier de sauvegarde chiffré a été sauvegardé" -#: src/js/controllers/index.js -msgid "English" -msgstr "Anglais" - #: public/views/includes/password.html msgid "Enter your password" msgstr "Entrer votre mot de passe" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Erreur au niveau de Wallet Service" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "Erreur de création du portefeuille" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "Erreur de création du portefeuille. Vérifiez votre connexion internet" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "Erreur d'importation du portefeuille :" @@ -444,15 +498,27 @@ msgstr "Fonds pour les vacances familiales" msgid "Fee" msgstr "Frais" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Stratégie des frais" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Stratégie des frais pour cette transaction" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" msgstr "Récupération des informations de paiement" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "Français" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Les fonds sont verrouillés par des propositions de dépenses en attente" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "Fonds reçus" @@ -473,7 +539,7 @@ msgstr "Générer une nouvelle adresse" msgid "Generating .csv file..." msgstr "Génération du fichier .csv..." -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "Allemand" @@ -489,7 +555,7 @@ msgstr "Paramètres globaux" msgid "Go back" msgstr "Retour" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "Grec" @@ -500,7 +566,8 @@ msgstr "Vous avez une sauvegarde de Copay v0.9 ?" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" +#: public/views/walletHome.html +msgid "Hide advanced options" msgstr "Masquer les options avancées" #: src/js/controllers/index.js @@ -549,15 +616,35 @@ msgstr "Importation du portefeuille..." msgid "Importing..." msgstr "Importation..." +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Adresse réseau incorrecte" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Fonds insuffisants" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Fonds insuffisants pour les frais" + #: public/views/walletHome.html msgid "Invalid" msgstr "Invalide" -#: src/js/controllers/index.js +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Adresse invalide" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitation pour partager un portefeuille Copay" + +#: public/views/translators.html msgid "Italian" msgstr "Italien" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "Japonais" @@ -570,6 +657,10 @@ msgstr "John" msgid "Join" msgstr "Rejoindre" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Rejoignez mon portefeuille Copay. Voici le code d'invitation : {{secret}} Vous pouvez télécharger Copay pour votre téléphone ou pour votre ordinateur sur https://copay.io" + #: public/views/add.html msgid "Join shared wallet" msgstr "Rejoindre" @@ -586,6 +677,14 @@ msgstr "Langue" msgid "Learn more about Wallet Migration" msgstr "En savoir plus sur la migration de portefeuille" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime effectif. Veuillez patienter pour créer une nouvelle proposition de dépense" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime effectif. Veuillez patienter pour supprimer cette proposition de dépense" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "Faire un paiement à" @@ -634,14 +733,14 @@ msgstr "Mon adresse Bitcoin" msgid "Network" msgstr "Réseau" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Erreur de connexion réseau" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "Nouvelle proposition de paiement" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "Non" - #: public/views/walletHome.html msgid "No Private key" msgstr "Aucune clé privée" @@ -650,21 +749,30 @@ msgstr "Aucune clé privée" msgid "No transactions yet" msgstr "Aucune transaction" -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Normal" msgstr "Normale" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Non autorisé" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" msgstr "Non valide" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Note" msgstr "Note" +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "Ok" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "Ok" @@ -768,6 +876,10 @@ msgstr "Paiement envoyé !" msgid "Payment to" msgstr "Paiement à" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Confirmations en attente" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "Supprimer définitivement ce portefeuille. CETTE ACTION NE PEUT PAS ÊTRE ANNULÉE" @@ -781,11 +893,15 @@ msgstr "Portefeuille personnel" msgid "Please enter the required fields" msgstr "Veuillez saisir les champs requis" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Veuillez mettre à jour Copay pour effectuer cette action" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "Veuillez sélectionner votre fichier de sauvegarde" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" msgstr "Portugais" @@ -793,7 +909,11 @@ msgstr "Portugais" msgid "Preferences" msgstr "Préférences" -#: src/js/controllers/preferencesFee.js +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Préparation de la sauvegarde..." + +#: src/js/services/feeService.js msgid "Priority" msgstr "Prioritaire" @@ -813,6 +933,11 @@ msgstr "Recevoir" msgid "Received" msgstr "Reçue" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Destinataires" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "Reconnexion au service de portefeuille..." @@ -856,6 +981,10 @@ msgstr "Requis" msgid "Retrying..." msgstr "Nouvelle tentative" +#: public/views/translators.html +msgid "Russian" +msgstr "Russe" + #: public/views/includes/password.html msgid "SET" msgstr "DEFINIR" @@ -972,8 +1101,13 @@ msgstr "Portefeuille partagé" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" -msgstr "Montrer les options avancées" +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Afficher les options avancées" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejetées par le serveur" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -983,10 +1117,18 @@ msgstr "Signature du paiement" msgid "Signing transaction" msgstr "Signature de la transaction" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "Espagnol" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "La proposition de dépense n'est pas acceptée" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Propostion de dépense introuvable" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1011,7 +1153,7 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "Le paiement a été créé mais n'a pas pu être achevé. Veuillez réessayer depuis l'écran d'accueil" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." +msgid "The payment was created but could not be signed. Please try again from home screen" msgstr "Le paiement a été créé mais n'a pas pu être signé. Veuillez réessayer depuis l'écran d'accueil" #: public/views/modals/txp-details.html @@ -1019,8 +1161,8 @@ msgid "The payment was removed by creator" msgstr "Le paiement a été supprimé par le créateur" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." -msgstr "Le paiement a été signé, mais ne peut pas être diffusé. Veuillez réessayer depuis l'écran d'accueil." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "Le paiement a été signé mais ne peut pas être diffusé. Veuillez réessayer depuis l'écran d'accueil" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1028,19 +1170,23 @@ msgstr "La clé privée pour ce portefeuille est chiffrée. Exporter une sauvega #: public/views/disclaimer.html msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." -msgstr "Le logiciel que vous êtes sur le point d'utiliser fonctionne comme un portefeuille numérique gratuit, open source et multi-signatures.\n" -"Le logiciel ne constitue pas un compte où BitPay, ou des tiers, agissent comme des intermédiaires financiers ou dépositaires de vos bitcoins.\n" -"Bien que le logiciel ait subi des tests bêta et continue d'être amélioré par les commentaires d'utilisateurs et de développeurs de la communauté open source, nous ne pouvons pas garantir qu'il n'y aura plus de bugs dans le logiciel.\n" -"Vous reconnaissez que votre utilisation de ce logiciel est à votre propre discrétion et est en conformité avec toutes les lois applicables.\n" -"Vous êtes responsable de la sauvegarde de vos mots de passe, paires de clés privées, codes PIN et autres codes que vous utilisez pour accéder au logiciel.\n" -"SI VOUS PERDEZ L'ACCÈS À VOTRE PORTEFEUILLE COPAY OU À VOS CLÉS PRIVÉES CHIFFRÉES ET QUE VOUS N'AVEZ PAS ENTREPOSÉ SÉPARÉMENT UNE SAUVEGARDE DE VOTRE PORTEFEUILLE ET LES MOTS DE PASSE CORRESPONDANT, VOUS RECONNAISSEZ ET ACCEPTEZ QUE LES BITCOINS QUE VOUS AVEZ ASSOCIÉ À CE PORTEFEUILLE COPAY DEVIENNENT INACCESSIBLES.\n" -"Toutes les transactions sont irréversibles.\n" -"Les auteurs de ce logiciel, employés et sociétés affiliés à BitPay, détenteurs de droits d'auteur, et BitPay, Inc. ne peuvent pas récupérer vos clés privées ou mots de passe si vous les perdez et ne peuvent pas garantir la confirmation des transactions étant donné qu'ils n'ont pas de contrôle sur le réseau Bitcoin.\n" -"Dans toute la mesure permise par la loi, ce logiciel est fourni “tel quel” et aucune représentation ou garantie ne peut être faite de toute nature, expresse ou implicite, y compris, mais sans s'y limiter, les garanties de qualité marchande, la conformité ou un usage particulier et absent de contrefaçon.\n" -"Vous assumez tous les risques associés à l'utilisation du logiciel.\n" -"En aucun cas les auteurs des logiciels, employés et sociétés affiliés de Bitpay, détenteurs de droits d'auteur, ou BitPay, Inc. ne peuvent être tenus responsables de toute réclamation, dommages ou autre responsabilité, que ce soit dans une action contractuelle, délictuelle ou autre, découlant ou en étant en connexion avec le logiciel.\n" +msgstr "Le logiciel que vous êtes sur le point d'utiliser fonctionne comme un portefeuille numérique gratuit, open source et multi-signatures.\n" +"Le logiciel ne constitue pas un compte où BitPay, ou des tiers, agissent comme des intermédiaires financiers ou dépositaires de vos bitcoins.\n" +"Bien que le logiciel ait subi des tests bêta et continue d'être amélioré par les commentaires d'utilisateurs et de développeurs de la communauté open source, nous ne pouvons pas garantir qu'il n'y aura plus de bugs dans le logiciel.\n" +"Vous reconnaissez que votre utilisation de ce logiciel est à votre propre discrétion et est en conformité avec toutes les lois applicables.\n" +"Vous êtes responsable de la sauvegarde de vos mots de passe, paires de clés privées, codes PIN et autres codes que vous utilisez pour accéder au logiciel.\n" +"SI VOUS PERDEZ L'ACCÈS À VOTRE PORTEFEUILLE COPAY OU À VOS CLÉS PRIVÉES CHIFFRÉES ET QUE VOUS N'AVEZ PAS ENTREPOSÉ SÉPARÉMENT UNE SAUVEGARDE DE VOTRE PORTEFEUILLE ET LES MOTS DE PASSE CORRESPONDANT, VOUS RECONNAISSEZ ET ACCEPTEZ QUE LES BITCOINS QUE VOUS AVEZ ASSOCIÉ À CE PORTEFEUILLE COPAY DEVIENNENT INACCESSIBLES.\n" +"Toutes les transactions sont irréversibles.\n" +"Les auteurs de ce logiciel, employés et sociétés affiliés à BitPay, détenteurs de droits d'auteur, et BitPay, Inc. ne peuvent pas récupérer vos clés privées ou mots de passe si vous les perdez et ne peuvent pas garantir la confirmation des transactions étant donné qu'ils n'ont pas de contrôle sur le réseau Bitcoin.\n" +"Dans toute la mesure permise par la loi, ce logiciel est fourni “tel quel” et aucune représentation ou garantie ne peut être faite de toute nature, expresse ou implicite, y compris, mais sans s'y limiter, les garanties de qualité marchande, la conformité ou un usage particulier et absent de contrefaçon.\n" +"Vous assumez tous les risques associés à l'utilisation du logiciel.\n" +"En aucun cas les auteurs des logiciels, employés et sociétés affiliés de Bitpay, détenteurs de droits d'auteur, ou BitPay, Inc. ne peuvent être tenus responsables de toute réclamation, dommages ou autre responsabilité, que ce soit dans une action contractuelle, délictuelle ou autre, découlant ou en étant en connexion avec le logiciel.\n" "Nous nous réservons le droit de modifier cette clause de temps à autre." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "La proposition de dépense n'est pas en attente" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1060,19 +1206,24 @@ msgstr "Cette transaction est devenue invalide ; il s'agit peut-être d'une tent #: public/views/walletHome.html 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).Vous pouvez le recréer depuis l'information locale." +msgstr "Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BWS) donné. Vous pouvez le recréer depuis l'information locale." #: public/views/modals/txp-details.html msgid "Time" msgstr "Heure" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "À" +#: public/views/includes/output.html +msgid "Total" +msgstr "Total" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "Solde verrouillé total" @@ -1081,6 +1232,18 @@ msgstr "Solde verrouillé total" msgid "Transaction" msgstr "Transaction" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction déjà diffusée" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Crédits de traduction" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Traducteurs" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "Impossible d'envoyer la proposition de transaction" @@ -1106,6 +1269,11 @@ msgstr "Non-approuvé" msgid "Updating Wallet..." msgstr "Mise à jour du portefeuille..." +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Utiliser les fonds non confirmés" + #: public/views/preferencesAbout.html msgid "Version" msgstr "Version" @@ -1150,6 +1318,7 @@ msgstr "Invitation de portefeuille" msgid "Wallet Invitation is not valid!" msgstr "L'invitation de portefeuille n'est pas valide !" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "Le portefeuille existe déjà" @@ -1158,18 +1327,34 @@ msgstr "Le portefeuille existe déjà" msgid "Wallet incomplete and broken" msgstr "Portefeuille incomplet et cassé " +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Le portefeuille est plein" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Le portefeuille n'est pas complet" + #: public/views/create.html msgid "Wallet name" msgstr "Nom du portefeuille" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "Le service de portefeuille s'est déconnecté. Vérifiez votre connexion Internetet la configuration de votre service de portefeuille." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Portefeuille introuvable" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet Service introuvable" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "Attention !" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "ATTENTION : Cette transaction a des entrées non confirmées" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "Mauvais mot de passe" @@ -1230,10 +1415,6 @@ msgstr "paramètres" msgid "too long!" msgstr "trop long !" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "{{fee.value}} bits par kB" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} seront déduits pour les frais de réseau Bitcoin" diff --git a/i18n/po/it.po b/i18n/po/it.po index 94f57bbd1..cda10b4b3 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Italian\n" "Language: it\n" -"PO-Revision-Date: 2015-07-23 11:32-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -39,6 +39,9 @@ msgid "About Copay" msgstr "Circa Copay" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "Accetta" @@ -56,6 +59,10 @@ msgstr "Indirizzo" msgid "Advanced" msgstr "Avanzato" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Invio Avanzato" + #: public/views/disclaimer.html msgid "Agree" msgstr "Acconsento" @@ -64,6 +71,10 @@ msgstr "Acconsento" msgid "Alias for {{index.walletName}}" msgstr "Alias per {{index.walletName}}" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "Tutti i contributori alla traduzione di Copay sono i benvenuti. Iscriviti a crowdin e unisciti al progetto Copay presso" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "Hai già un portafoglio?" @@ -74,11 +85,15 @@ msgstr "Valuta alternativa" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "Ammontare" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Importo sotto soglia" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -97,6 +112,11 @@ msgstr "Sei sicuro di voler eliminare questo portafoglio?" msgid "Available Balance" msgstr "Saldo disponibile" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Tempo medio di conferma: {{fee.nbBlocks * 10}} minuti" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -124,6 +144,10 @@ msgstr "Esegui backup ora" msgid "Backup options" msgstr "Opzioni di backup" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Invito al wallet non corretto" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "Prima di ricevere fondi, è altamente raccomandato eseguire il backup delle chiavi del portafoglio." @@ -141,8 +165,8 @@ msgid "Bitcoin address" msgstr "Indirizzo Bitcoin" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "Le transazioni in bitcoin possono includere una tassa raccolta dai minatori sulla rete. Più alto il costo, maggiore sarà l'incentivo di un minatore per includere tale transazione in un blocco. Il livello 'Emergenza' dovrebbe essere usato solo quando c'è una congestione di rete." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Le transazioni bitcoin possono includere una tassa raccolta dai minatori della rete. Più alto è il costo, maggiore sarà la possibilità di includere tale transazione in un blocco. Le tasse effettive sono determinate in base al carico della rete ed ai criteri selezionati." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -170,9 +194,17 @@ msgstr "Annulla" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "Annulla" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Non è possibile aggiungere un portafoglio più di una volta" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "Certificato da" @@ -181,10 +213,6 @@ msgstr "Certificato da" msgid "Changing wallet alias only affects the local wallet name." msgstr "Il cambiamento degli alias dei portafogli influenza solo il nome del portafoglio locale." -#: src/js/controllers/walletHome.js -msgid "Check you connection and try again" -msgstr "Verifica la connessione e riprova" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "Seleziona un file di backup dal tuo computer" @@ -194,6 +222,7 @@ msgid "Choose a wallet to send funds" msgstr "Seleziona un portafoglio per inviare fondi" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -210,14 +239,42 @@ msgstr "Colore" msgid "Commit hash" msgstr "Commit hash" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Conferma" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "Conferme" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer già in questo portafoglio" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer già registrato" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Copayer già votato su questa proposta" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Mancata corrispondenza dei dati del copayer" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "Copayers" +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copiato negli appunti" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "Copia il backup in un posto sicuro" @@ -231,20 +288,20 @@ msgid "Copy to clipboard" msgstr "Copia negli appunti" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" -msgstr "Impossibile accettare il pagamento. Controlla la connessione e riprova di nuovo" +msgid "Could not accept payment" +msgstr "Could not accept payment" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Could not access Wallet Service: Not found" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" -msgstr "Impossibile trasmettere il pagamento. Controlla la connessione e riprova" +msgid "Could not broadcast payment" +msgstr "Could not broadcast payment" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "Impossibile connettersi al servizio portafoglio. Verifica la tua connessione Internet e la configurazione del servizio portafoglio." - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" -msgstr "Impossibile creare l'indirizzo. Verifica la tua connessione e prova di nuovo" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Could not create address" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -259,8 +316,8 @@ msgid "Could not decrypt file, check your password" msgstr "Impossibile decrittografare il file, controlla la tua password" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "Impossibile eliminare la proposta di pagamento. Verifica la tua connessione e prova di nuovo" +msgid "Could not delete payment proposal" +msgstr "Could not delete payment proposal" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -278,23 +335,23 @@ msgstr "Impossibile importare. Verifica file importato e password" msgid "Could not join using the specified extended private key" msgstr "Impossibile partecipare utilizzando la chiave privata estesa specificata" -#: src/js/controllers/join.js -msgid "Could not join wallet:" -msgstr "Impossibile partecipare al portafoglio:" +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Impossibile partecipare al portafoglio" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Impossibile riconoscere un Codice QR Bitcoin valido" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" -msgstr "Impossibile rifiutare il pagamento. Verifica la tua connessione e prova di nuovo" +msgid "Could not reject payment" +msgstr "Impossibile rifiutare il pagamento" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "Impossibile inviare il pagamento" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "Impossibile aggiornare il Portafoglio" @@ -331,6 +388,11 @@ msgstr "Creazione Portafoglio..." msgid "Creating transaction" msgstr "Creazione transazione" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Tassa corrente per questa policy: {{fee.feePerKBUnit}}/kiB" + #: public/views/modals/tx-details.html msgid "Date" msgstr "Data" @@ -370,6 +432,10 @@ msgstr "Disabilitato" msgid "Do not include private key in backup" msgstr "Non includere la chiave privata nel backup" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." + #: public/views/walletHome.html msgid "Download CSV file" msgstr "Scarica in formato CSV" @@ -378,22 +444,14 @@ msgstr "Scarica in formato CSV" msgid "Download backup" msgstr "Scarica il backup" -#: public/views/includes/password.html -msgid "ENTER" -msgstr "IMMETTERE" - -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Economy" -msgstr "Economia" +msgstr "Economy" #: public/views/preferences.html msgid "Email Notifications" msgstr "Notifiche Email" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "Emergenza" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Cripta la chiave privata" @@ -402,22 +460,18 @@ msgstr "Cripta la chiave privata" msgid "Encrypted backup file saved" msgstr "Backup criptato salvato" -#: src/js/controllers/index.js -msgid "English" -msgstr "Inglese" - #: public/views/includes/password.html msgid "Enter your password" msgstr "Inserisci la tua password" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error at Wallet Service" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "Errore creazione portafoglio" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "Errore creazione portafoglio. Verifica la tua connessione internet" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "Errore importazione portafoglio:" @@ -444,15 +498,27 @@ msgstr "Fondi vacanza di famiglia" msgid "Fee" msgstr "Tassa" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Politica delle tasse" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" msgstr "Recuperando le informazioni del pagamento" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "Francese" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Funds are locked by pending spend proposals" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "Fondi ricevuti" @@ -473,7 +539,7 @@ msgstr "Genera un nuovo indirizzo" msgid "Generating .csv file..." msgstr "Genera un file .csv..." -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "Tedesco" @@ -489,7 +555,7 @@ msgstr "Impostazioni Globali" msgid "Go back" msgstr "Indietro" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "Greco" @@ -500,8 +566,9 @@ msgstr "Hai un Backup da Copay v0.9?" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" -msgstr "Nascondi opzioni avanzate" +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" #: src/js/controllers/index.js msgid "History" @@ -549,15 +616,35 @@ msgstr "Importando il portafoglio..." msgid "Importing..." msgstr "Importando..." +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Incorrect address network" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Insufficient funds" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Insufficient funds for fee" + #: public/views/walletHome.html msgid "Invalid" msgstr "Invalido" -#: src/js/controllers/index.js +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Invalid address" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invito a condividere un portafoglio Copay" + +#: public/views/translators.html msgid "Italian" msgstr "Italiano" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "Giapponese" @@ -570,6 +657,10 @@ msgstr "John" msgid "Join" msgstr "Unisciti" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Unisciti al mio portafoglio Copay. Ecco il codice di invito: {{secret}} Puoi scaricare Copay dal tuo telefono o computer da https://copay.io" + #: public/views/add.html msgid "Join shared wallet" msgstr "Unisciti al portafoglio condiviso" @@ -586,6 +677,14 @@ msgstr "Lingua" msgid "Learn more about Wallet Migration" msgstr "Ulteriori informazioni sulla migrazione di portafoglio" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effect. Please wait to create a new spend proposal" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effect. Please wait to remove this spend proposal" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "Effettuare un pagamento a" @@ -634,14 +733,14 @@ msgstr "Il mio indirizzo Bitcoin" msgid "Network" msgstr "Network" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Network connection error" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "Nuova proposta di pagamento" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "No" - #: public/views/walletHome.html msgid "No Private key" msgstr "Nessuna chiave privata" @@ -650,9 +749,13 @@ msgstr "Nessuna chiave privata" msgid "No transactions yet" msgstr "Ancora nessuna transazione" -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Normal" -msgstr "Normale" +msgstr "Normal" + +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Not authorized" #: public/views/walletHome.html #: public/views/modals/customized-amount.html @@ -660,11 +763,16 @@ msgid "Not valid" msgstr "Non valido" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Note" msgstr "Nota" +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "Ok" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "OKAY" @@ -768,6 +876,10 @@ msgstr "Pagamento inviato!" msgid "Payment to" msgstr "Pagamento a" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "Elimina definitivamente questo portafoglio. QUESTA AZIONE NON PUO' ESSERE INVERTITA" @@ -781,11 +893,15 @@ msgstr "Portafoglio Personale" msgid "Please enter the required fields" msgstr "Per favore completa i campi richiesti" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Please upgrade Copay to perform this action" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "Per favore, selezione il tuo file di backup" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" msgstr "Portoghese" @@ -793,9 +909,13 @@ msgstr "Portoghese" msgid "Preferences" msgstr "Preferenze" -#: src/js/controllers/preferencesFee.js +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Preparing backup..." + +#: src/js/services/feeService.js msgid "Priority" -msgstr "Priorità" +msgstr "Priority" #: public/views/modals/customized-amount.html msgid "QR Code" @@ -813,6 +933,11 @@ msgstr "Ricevi" msgid "Received" msgstr "Ricevuti" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Destinatari" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "Riconnessione al Servizio Portafoglio..." @@ -856,6 +981,10 @@ msgstr "Richiesto" msgid "Retrying..." msgstr "Sto riprovando..." +#: public/views/translators.html +msgid "Russian" +msgstr "Russian" + #: public/views/includes/password.html msgid "SET" msgstr "IMPOSTA" @@ -972,8 +1101,13 @@ msgstr "Portafoglio Condiviso" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" -msgstr "Mostra opzioni avanzate" +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejected by server" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -983,10 +1117,18 @@ msgstr "Sto firmando il pagamento" msgid "Signing transaction" msgstr "Sto firmando la transazione" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "Spagnolo" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Spend proposal is not accepted" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Spend proposal not found" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1011,16 +1153,16 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "Il pagamento è stato creato ma è stato impossibile completarlo. Per favore prova di nuovo dalla schermata iniziale" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." -msgstr "Il pagamento è stato creato ma è stato impossibile firmarlo. Per favore prova di nuovo dalla schermata iniziale." +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "The payment was created but could not be signed. Please try again from home screen" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "Il pagamento è stato rimosso dal creatore" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." -msgstr "Il pagamento è stato firmato ma non è stato possibile trasmetterlo. Per favore prova di nuovo dalla schermata principale." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1030,6 +1172,10 @@ msgstr "La chiave privata di questo portafoglio è criptata. L'esportazione del msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "Il software che stai per utilizzare è un portafoglio digitale gratis, open source, e multi-firma. Il software non costituisce un account in cui BitPay o altre terze parti servono come intermediari finanziari o custodi dei tuoi bitcoins. Anche se il software beta è stato testato e continua ad essere migliorato dai feedback dalla comunità open source e dai programmatori, non possiamo garantire la completa assenza di errori nel software. Sei consapevole che l'utilizzo di questo software avviene a tua discrezione e in accordo con tutte le leggi applicabili. Sei responsabile della gestione della tua password, chiavi private, PIN e tutti gli altri codici che utilizzi per accedere a questo portafoglio. SE PERDI L'ACCESSO AL TUO PORTAFOGLIO O ALLE TUE CHIAVI PRIVATE CRIPTATE, E NON POSSIEDI UN BACKUP DEL PORTAFOGLIO O DELLE PASSWORD CORRISPONDENTI, SEI CONSAPEVOLE DEL FATTO CHE OGNI BITCOIN ASSOCIATO AL TUO PORTAFOGLIO COPAY SARA' INACCESSIBILE. Tutte le richieste di transazione sono irreversibili. Gli autori del software, dipendenti e affiliati di BitPay, possessori del copyright, e BitPay, Inc., non possono recuperare le tue chiavi private o le tue passwords se le dimentichi o le perdi, e non possono garantire la conferma delle transazioni poichè non sono in controllo del Network Bitcoin. Nella misura massima consentita dalla legge, il software è reso disponibile \"così com'è\" e nessuna rappresentazione o richiesta di garanzia può essere inoltrata, espressa o implicita, comprese ma non limitato alle garanzie di commerciabilità, idoneità o a particolare scopo e non-infrazione. Ti assumi tutti i rischi relativi all'utilizzo del software. In nessuno caso gli autori del software, dipendenti o affiliati BitPay, possessori del Copyright, o BitPay, inc, sono responsabili di qualsiasi rivendicazioni, danni o responsabili di terzi, sia in un'azione di contratto, torto, o derivanti da, o i connessione con questo software. Ci riserviamo il diritto di modificare questi termini di volta in volta." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "The spend proposal is not pending" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1056,12 +1202,17 @@ msgid "Time" msgstr "Tempo" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "A" +#: public/views/includes/output.html +msgid "Total" +msgstr "Totale" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "Totale Importo Bloccato" @@ -1070,6 +1221,18 @@ msgstr "Totale Importo Bloccato" msgid "Transaction" msgstr "Transazione" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction already broadcasted" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Translation Credits" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Translators" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "Impossibile inviare la proposta di transazione" @@ -1095,6 +1258,11 @@ msgstr "Non attendibile" msgid "Updating Wallet..." msgstr "Aggiornamento portafoglio..." +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + #: public/views/preferencesAbout.html msgid "Version" msgstr "Versione" @@ -1139,6 +1307,7 @@ msgstr "Invito Portafoglio" msgid "Wallet Invitation is not valid!" msgstr "Invito Portafoglio non valido!" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "Il portafoglio esiste già" @@ -1147,18 +1316,34 @@ msgstr "Il portafoglio esiste già" msgid "Wallet incomplete and broken" msgstr "Portafoglio incompleto e danneggiato" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Wallet is full" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Wallet is not complete" + #: public/views/create.html msgid "Wallet name" msgstr "Nome Portafoglio" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "Servizio portafoglio scaduto. Verifica la tua connessione internet e la configurazione del tuo servizio portafoglio." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Wallet not found" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet service not found" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "Attenzione!" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Warning: this transaction has unconfirmed inputs" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "Password sbagliata" @@ -1219,10 +1404,6 @@ msgstr "impostazioni" msgid "too long!" msgstr "troppo lungo!" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "{{fee.value}} bits per kB" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} verranno scalati come commissione del Network Bitcoin" diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 31d11ced6..00febc4fa 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Japanese\n" "Language: ja\n" -"PO-Revision-Date: 2015-07-23 11:32-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -39,6 +39,9 @@ msgid "About Copay" msgstr "Copayについて" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "承諾" @@ -56,6 +59,10 @@ msgstr "アドレス" msgid "Advanced" msgstr "上級者向け" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "上級者向け送金" + #: public/views/disclaimer.html msgid "Agree" msgstr "同意します" @@ -64,6 +71,10 @@ msgstr "同意します" msgid "Alias for {{index.walletName}}" msgstr "{{index.walletName}} の通称設定" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "Copayの翻訳は簡単に投稿することができます。crowdin.comのアカウント作成の後、自由にご参加いただけるプロジェクトページはこちら" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "すでにウォレットをお持ちですか？" @@ -74,11 +85,15 @@ msgstr "表示通貨" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "金額" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "最小送金額を下回っています。" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -91,13 +106,18 @@ msgstr "変更を反映" #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "Are you sure you want to delete this wallet?" -msgstr "本当にこのウォレットを削除しても\n" +msgstr "本当にこのウォレットを削除しても\n" "宜しいですか？" #: public/views/walletHome.html msgid "Available Balance" msgstr "送金可能残高" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "承認までの時間(平均)： {{fee.nbBlocks * 10}} 分" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -125,6 +145,10 @@ msgstr "今すぐバックアップ" msgid "Backup options" msgstr "バックアップ設定" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "不正なウォレット招待コード" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "ビットコインをもらう前に、このウォレットのバックアップすることを強くおすすめします。" @@ -142,8 +166,8 @@ msgid "Bitcoin address" msgstr "ビットコインアドレス" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "円滑な送金をしていただくために、ビットコインの送金には少量の手数料を付けることが義務付けられております。この手数料はビットコインのネットワークを運用する人たちに寄付され、より高い手数料であればより優先的にブロックに含まれ、承認されます。「緊急」の設定はネットワーク全体の混雑時にのみご利用下さい。" +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "円滑な送金をしていただくために、ビットコインの送金には少量の手数料を付けることが義務付けられております。この手数料はビットコインのネットワークを運用する人たちに寄付され、より高い手数料であればより優先的にブロックに含まれ、承認されます。選択された手数料基準やネットワークの混雑状況により、実際に払われる手数料が変動することがあります。" #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -171,9 +195,17 @@ msgstr "キャンセル" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "キャンセル" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "同じ端末で同じウォレットに複数回参加することができません。" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "証明元：" @@ -182,10 +214,6 @@ msgstr "証明元：" msgid "Changing wallet alias only affects the local wallet name." msgstr "ウォレット通称を変更しても、この端末でしか変わりません。" -#: src/js/controllers/walletHome.js -msgid "Check you connection and try again" -msgstr "接続を確認し、やり直して下さい。" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "パソコンからバックアップファイルを選択して下さい。" @@ -195,6 +223,7 @@ msgid "Choose a wallet to send funds" msgstr "送金元のウォレットを選択して下さい" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -211,14 +240,42 @@ msgstr "色" msgid "Commit hash" msgstr "コミットのハッシュ値" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "確認" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "承認回数" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "ウォレット参加者が既に存在しています。" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "ウォレット参加者が既に登録されています。" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "ウォレット参加者が既に送金の提案の意思表明をしています。" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "ウォレット参加者のデータ不整合" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "ウォレット参加者" +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "クリップボードにコピーしました" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "安全な場所でバックアップを保管して下さい" @@ -232,20 +289,20 @@ msgid "Copy to clipboard" msgstr "クリップボードへコピー" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" -msgstr "送金の提案が承諾できませんでした。接続を確認し、やり直して下さい。" +msgid "Could not accept payment" +msgstr "送金を承認できませんでした。" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Wallet Serviceにアクセスできませんでした: 見つかりません" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" -msgstr "送金できませんでした。接続を確認し、やり直して下さい。" +msgid "Could not broadcast payment" +msgstr "送金を配信できませんでした。" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "ウォレットサービスと接続できませんでした。インターネットの接続とウォレットサービスの設定を確認して下さい。" - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" -msgstr "アドレスが生成できませんでした。接続を確認し、やり直して下さい。" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "アドレスを生成できませんでした。" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -260,8 +317,8 @@ msgid "Could not decrypt file, check your password" msgstr "複合化できませんでした。パスワードが正しいかご確認下さい。" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "送金の提案が削除できませんでした。接続を確認し、やり直して下さい。" +msgid "Could not delete payment proposal" +msgstr "送金の提案を削除できませんでした" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -279,23 +336,23 @@ msgstr "インポートできませんでした。入力ファイルとパスワ msgid "Could not join using the specified extended private key" msgstr "指定された拡張秘密鍵で参加できませんでした。" -#: src/js/controllers/join.js -msgid "Could not join wallet:" -msgstr "ウォレットに参加できませんでした：" +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "ウォレットに参加できませんでした。" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" msgstr "有効なビットコインQRコードが認識できませんでした。" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" -msgstr "送金の提案を却下できませんでした。接続を確認し、やり直して下さい。" +msgid "Could not reject payment" +msgstr "送金を却下できませんでした。" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "送金できませんでした。" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "ウォレットが更新できませんでした。" @@ -332,6 +389,11 @@ msgstr "ウォレット作成中…" msgid "Creating transaction" msgstr "取引作成中…" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "この手数料基準の現レート： {{fee.feePerKBUnit}}/kiB" + #: public/views/modals/tx-details.html msgid "Date" msgstr "日付" @@ -371,6 +433,10 @@ msgstr "無効" msgid "Do not include private key in backup" msgstr "バックアップに秘密鍵を含めない" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "ご自分の言語はCrowdinで見当たりませんか？Crowdinの管理者に連絡とってみてください。是非とも対応したく思っております。" + #: public/views/walletHome.html msgid "Download CSV file" msgstr "CSVファイルをダウンロード" @@ -379,11 +445,7 @@ msgstr "CSVファイルをダウンロード" msgid "Download backup" msgstr "バックアップをダウンロード" -#: public/views/includes/password.html -msgid "ENTER" -msgstr "ENTER" - -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Economy" msgstr "節約" @@ -391,10 +453,6 @@ msgstr "節約" msgid "Email Notifications" msgstr "メールのお知らせ" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "緊急" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "秘密鍵を暗号化" @@ -403,22 +461,18 @@ msgstr "秘密鍵を暗号化" msgid "Encrypted backup file saved" msgstr "暗号化されたバックアップ保存しました" -#: src/js/controllers/index.js -msgid "English" -msgstr "英語" - #: public/views/includes/password.html msgid "Enter your password" msgstr "パスワードを入力して下さい。" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Wallet Serviceにてエラー" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "ウォレット作成時にエラー" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "ウォレット作成時にエラー発生、インターネットの接続をご確認下さい。" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "ウォレットインポート時にエラー：" @@ -445,15 +499,27 @@ msgstr "家族旅行貯金" msgid "Fee" msgstr "手数料" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "手数料基準" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "当取引の手数料基準" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" msgstr "支払い情報要求しています…" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "フランス語" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "協議中の送金の提案により、資金がロックされています。" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "着金あり" @@ -474,7 +540,7 @@ msgstr "新規アドレスを生成" msgid "Generating .csv file..." msgstr "CSVファイル作成中…" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "ドイツ語" @@ -490,7 +556,7 @@ msgstr "グローバル設定" msgid "Go back" msgstr "前に戻る" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "ギリシャ語" @@ -501,8 +567,9 @@ msgstr "Copay v0.9 のバックアップをお持ちですか？" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" -msgstr "詳細設定　非表示" +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "詳細設定を非表示" #: src/js/controllers/index.js msgid "History" @@ -550,15 +617,35 @@ msgstr "ウォレットインポート中…" msgid "Importing..." msgstr "インポート中…" +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "アドレスのネットワークが不正です。" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "残高不足" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "手数料付けるには残高が足りません" + #: public/views/walletHome.html msgid "Invalid" msgstr "無効" -#: src/js/controllers/index.js +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "不正アドレス" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Copay共有ウォレットへの招待" + +#: public/views/translators.html msgid "Italian" msgstr "イタリア語" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "日本語" @@ -571,6 +658,10 @@ msgstr "山田太郎" msgid "Join" msgstr "参加" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Copayの共有ウォレット作りました： {{secret}} この招待コードを入力して、ウォレットに参加して下さい。アプリのダウンロードは https://copay.io にてどうぞ！" + #: public/views/add.html msgid "Join shared wallet" msgstr "共有ウォレットに参加" @@ -587,6 +678,14 @@ msgstr "言語設定" msgid "Learn more about Wallet Migration" msgstr "ウォレット移行について詳しく" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime待ち中です。新しい送金の提案が作成できるまであとしばらくお待ち下さい。" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime待ち中です。この送金の提案が削除できるまであとしばらくお待ち下さい。" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "支払いは次の宛先へ" @@ -635,14 +734,14 @@ msgstr "私のビットコインアドレス：" msgid "Network" msgstr "ネットワーク" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "ネットワーク接続エラー" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "新しい送金の提案" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "いいえ" - #: public/views/walletHome.html msgid "No Private key" msgstr "秘密鍵なし" @@ -651,21 +750,30 @@ msgstr "秘密鍵なし" msgid "No transactions yet" msgstr "取引がありません" -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Normal" msgstr "通常" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "権限がありません。" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" msgstr "無効です" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Note" msgstr "メモ" +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "OK" @@ -769,9 +877,13 @@ msgstr "支払いを送信しました！" msgid "Payment to" msgstr "支払い先" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "承認待ち" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" -msgstr "永久にこのウォレットを削除します。\n" +msgstr "永久にこのウォレットを削除します。\n" "二度と取り戻せない行為ですのどご注意下さい。" #: public/views/create.html @@ -783,11 +895,15 @@ msgstr "個人用ウォレット" msgid "Please enter the required fields" msgstr "必須項目をご入力下さい" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "この操作を実行するにはCopayを最新バージョンに更新してください" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "バックアップファイルを選択" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" msgstr "ポルトガル語" @@ -795,7 +911,11 @@ msgstr "ポルトガル語" msgid "Preferences" msgstr "設定" -#: src/js/controllers/preferencesFee.js +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "バックアップを準備中..." + +#: src/js/services/feeService.js msgid "Priority" msgstr "優先" @@ -815,6 +935,11 @@ msgstr "受取" msgid "Received" msgstr "受取済み" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "受取人" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "Wallet Serviceへ再接続しています…" @@ -858,6 +983,10 @@ msgstr "入力必須" msgid "Retrying..." msgstr "再度試しています…" +#: public/views/translators.html +msgid "Russian" +msgstr "ロシア語" + #: public/views/includes/password.html msgid "SET" msgstr "指定" @@ -961,8 +1090,8 @@ msgstr "招待コードを共有" #: public/views/copayers.html msgid "Share this invitation with your copayers" -msgstr "ウォレット参加者に\n" -"この招待コードを\n" +msgstr "ウォレット参加者に\n" +"この招待コードを\n" "送って下さい。" #: public/views/walletHome.html @@ -976,8 +1105,13 @@ msgstr "共有ウォレットに参加" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" -msgstr "詳細設定　表示" +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "詳細設定を表示" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "サーバーより署名が却下されました。" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -987,10 +1121,18 @@ msgstr "送金の提案署名中" msgid "Signing transaction" msgstr "取引署名中" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "スペイン語" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "送金の提案が受諾されませんでした。" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "送金の提案が見つかりませんでした。" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1015,7 +1157,7 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "送金の提案は作成されましたが完了できませんでした。ホーム画面からやり直して下さい。" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." +msgid "The payment was created but could not be signed. Please try again from home screen" msgstr "送金の提案は作成されましたが署名できませんでした。ホーム画面からやり直して下さい。" #: public/views/modals/txp-details.html @@ -1023,7 +1165,7 @@ msgid "The payment was removed by creator" msgstr "送金の提案が作成者により削除されました" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" msgstr "送金の提案は署名されましたが送信できませんでした。ホーム画面からやり直して下さい。" #: public/views/backup.html @@ -1032,9 +1174,13 @@ msgstr "このウォレットの秘密鍵が暗号化されています。バッ #: public/views/disclaimer.html msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." -msgstr "当ソフトウェアは無料のオープンソースプロジェクトで、マルチシグネチャを用いるデジタルウォレットです。BitPay, Inc. 若しくはその他の第三者がアクセス権限を管理する、若しくはデジタル資産の代理保管を行うサービスではありません。このソフトは長いテスト期間を経てリリースしましたが、今後バグや不具合が見つからないという保障はございません。この規約に同意することで、自己責任で利用するものとし、このソフトを用いてお住まいの地域の法令の違反はしないことを意味します。このソフトを正常に利用するために必要なパスワード、秘密鍵、暗証番号などの秘密情報は自己責任で管理するものとします。＊＊＊Copayウォレットとその中にある秘密鍵の情報を紛失してしまい、尚且つバックアップが無い、若しくはそのバックアップを暗号化した際のパスワードが分からないなどの状況に陥ってしまえば、そのウォレットに含まれた全てのビットコインが永久送金不可能となってしまうことを認識し、同意するものとします。＊＊＊署名が完了してしまった取引は取り消しが不可能となります。このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, Inc.自体もパスワード・秘密鍵・パスワードなどへのアクセスが不可能なため、教えることがだきません、なお、ビットコインのネットワークへの影響が無いので、取引の取り消しや優先的な承認などはできません。このソフトはそのままの提供となり、このソフトの利用に関わるあらゆる責任とリスクを自己責任で被り、利用するものとし、いかなる損害が発生しても、このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, Inc.自体も責任を求めることは無いと誓います。この規約の言葉や表現のニュアンスによる解釈が必要となった場合、規約の元である英語のものを正とします。和訳は簡単な要約と考えて下さい。下記に英語の規約がありますので、英語が理解できる方は是非熟読して下さい。\n\n" +msgstr "当ソフトウェアは無料のオープンソースプロジェクトで、マルチシグネチャを用いるデジタルウォレットです。BitPay, Inc. 若しくはその他の第三者がアクセス権限を管理する、若しくはデジタル資産の代理保管を行うサービスではありません。このソフトは長いテスト期間を経てリリースしましたが、今後バグや不具合が見つからないという保障はございません。この規約に同意することで、自己責任で利用するものとし、このソフトを用いてお住まいの地域の法令の違反はしないことを意味します。このソフトを正常に利用するために必要なパスワード、秘密鍵、暗証番号などの秘密情報は自己責任で管理するものとします。＊＊＊Copayウォレットとその中にある秘密鍵の情報を紛失してしまい、尚且つバックアップが無い、若しくはそのバックアップを暗号化した際のパスワードが分からないなどの状況に陥ってしまえば、そのウォレットに含まれた全てのビットコインが永久送金不可能となってしまうことを認識し、同意するものとします。＊＊＊署名が完了してしまった取引は取り消しが不可能となります。このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, Inc.自体もパスワード・秘密鍵・パスワードなどへのアクセスが不可能なため、教えることがだきません、なお、ビットコインのネットワークへの影響が無いので、取引の取り消しや優先的な承認などはできません。このソフトはそのままの提供となり、このソフトの利用に関わるあらゆる責任とリスクを自己責任で被り、利用するものとし、いかなる損害が発生しても、このソフトの開発者、BitPayの従業員とその関係者、著作権所有者、BitPay, Inc.自体も責任を求めることは無いと誓います。この規約の言葉や表現のニュアンスによる解釈が必要となった場合、規約の元である英語のものを正とします。和訳は簡単な要約と考えて下さい。下記に英語の規約がありますので、英語が理解できる方は是非熟読して下さい。\n\n" "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "送金の提案が協議中ではありません。" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1061,12 +1207,17 @@ msgid "Time" msgstr "時刻" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "宛先" +#: public/views/includes/output.html +msgid "Total" +msgstr "合計" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "ロック中の残高" @@ -1075,6 +1226,18 @@ msgstr "ロック中の残高" msgid "Transaction" msgstr "取引" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "取引は既に配信されました。" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "翻訳ボランティアの皆さん" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "翻訳者" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "取引提案を送れませんでした。" @@ -1100,6 +1263,11 @@ msgstr "信頼されていません。" msgid "Updating Wallet..." msgstr "ウォレット更新中…" +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "未承認ビットコインを使用" + #: public/views/preferencesAbout.html msgid "Version" msgstr "バージョン" @@ -1144,6 +1312,7 @@ msgstr "ウォレット招待" msgid "Wallet Invitation is not valid!" msgstr "ウォレット招待コードが無効です！" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "既存のウォレットです" @@ -1152,18 +1321,34 @@ msgstr "既存のウォレットです" msgid "Wallet incomplete and broken" msgstr "ウォレットが未完成で破損しています" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "ウォレットがいっぱいです。" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "ウォレットが未完成です。" + #: public/views/create.html msgid "Wallet name" msgstr "ウォレット名" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "ウォレットサービスがタイムアウトになりました。インターネットの接続とウォレットサービスの設定を確認して下さい。" +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "ウォレットが見つかりません。" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet serviceが見つかりません。" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "注意！" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "注意: この取引は未承認資金が含まれており、承認されるまで商品等をお渡しするのを待つことをお勧めします。" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "不正なパスワード" @@ -1224,10 +1409,6 @@ msgstr "設定" msgid "too long!" msgstr "長すぎます！" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "1キロバイト当たり {{fee.value}} bits" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} のビットコインネットワーク手数料が差し引かれます。" diff --git a/i18n/po/pt.po b/i18n/po/pt.po index ee04d2efc..7457cd6c8 100644 --- a/i18n/po/pt.po +++ b/i18n/po/pt.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Portuguese\n" "Language: pt\n" -"PO-Revision-Date: 2015-07-23 11:32-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -39,6 +39,9 @@ msgid "About Copay" msgstr "Sobre a Copay" #: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Accept" msgstr "Aceitar" @@ -56,6 +59,10 @@ msgstr "Endereço" msgid "Advanced" msgstr "Avançado" +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Advanced Send" + #: public/views/disclaimer.html msgid "Agree" msgstr "Agree" @@ -64,6 +71,10 @@ msgstr "Agree" msgid "Alias for {{index.walletName}}" msgstr "Alias for {{index.walletName}}" +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" + #: public/views/splash.html msgid "Already have a wallet?" msgstr "Já tem uma carteira?" @@ -74,11 +85,15 @@ msgstr "Moeda Alternativa" #: public/views/paymentUri.html #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/customized-amount.html -#: public/views/modals/txp-details.html msgid "Amount" msgstr "Valor" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Amount below dust threshold" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -97,6 +112,11 @@ msgstr "Tem certeza que deseja excluir esta carteira?" msgid "Available Balance" msgstr "Saldo Disponível" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Average confirmation time: {{fee.nbBlocks * 10}} minutes" + #: public/views/create.html #: public/views/join.html msgid "BIP32 master extended private key" @@ -124,6 +144,10 @@ msgstr "Backup agora" msgid "Backup options" msgstr "Opções de backup" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Bad wallet invitation" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "Antes de receber fundos, é altamente recomendável que você faça backup de suas chaves de carteira." @@ -141,8 +165,8 @@ msgid "Bitcoin address" msgstr "Endereço Bitcoin" #: public/views/preferencesFee.html -msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." -msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. The ‘Emergency’ level should only be used when there is a network congestion." +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." #: public/views/modals/txp-details.html msgid "Broadcast Payment" @@ -170,9 +194,17 @@ msgstr "CANCELAR" #: public/views/copayers.html #: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js msgid "Cancel" msgstr "Cancelar" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Cannot join the same wallet more that once" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "Certificado por" @@ -181,10 +213,6 @@ msgstr "Certificado por" msgid "Changing wallet alias only affects the local wallet name." msgstr "Alterando o apelido da carteira somente afeta o nome da carteira local." -#: src/js/controllers/walletHome.js -msgid "Check you connection and try again" -msgstr "Verifique sua conexão e tente novamente" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "Escolha um arquivo de backup do seu computador" @@ -194,6 +222,7 @@ msgid "Choose a wallet to send funds" msgstr "Choose a wallet to send funds" #: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html #: public/views/modals/copayers.html #: public/views/modals/customized-amount.html #: public/views/modals/paypro.html @@ -210,14 +239,42 @@ msgstr "Cor" msgid "Commit hash" msgstr "Commit de hash" +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Confirm" + #: public/views/modals/tx-details.html msgid "Confirmations" msgstr "Confirmações" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer already in this wallet" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer already registered" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Copayer already voted on this spend proposal" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Copayer data mismatch" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "Copayers" +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copied to clipboard" + #: public/views/backup.html msgid "Copy backup to a safe place" msgstr "Copie o backup para um lugar seguro" @@ -231,20 +288,20 @@ msgid "Copy to clipboard" msgstr "Copiar para área de transferência" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check you connection and try again" -msgstr "Não foi possível aceitar pagamentos. Verifique sua conexão e tente novamente" +msgid "Could not accept payment" +msgstr "Could not accept payment" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Could not access Wallet Service: Not found" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check you connection and try again" -msgstr "Não foi possível transmitir pagamentos. Verifique sua conexão e tente novamente" +msgid "Could not broadcast payment" +msgstr "Could not broadcast payment" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "Could not connect wallet service. Check your Internet connection and your wallet service configuration." - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check you connection and try again" -msgstr "Não foi possível criar o endereço. Verifique sua conexão e tente novamente" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Could not create address" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -259,8 +316,8 @@ msgid "Could not decrypt file, check your password" msgstr "Não foi possível descriptografar o arquivo, verifique sua senha" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check you connection and try again" -msgstr "Não foi possível apagar a proposta de pagamento. Verifique sua conexão e tente novamente" +msgid "Could not delete payment proposal" +msgstr "Could not delete payment proposal" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -278,23 +335,23 @@ msgstr "Não foi possível importar. Verifique o arquivo de entrada e senha" msgid "Could not join using the specified extended private key" msgstr "Não é possível asssociar-se usando a chave privada estendida especificada" -#: src/js/controllers/join.js -msgid "Could not join wallet:" -msgstr "Não é possível se associar a carteira:" +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Could not join wallet" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Could not recognize a valid Bitcoin QR Code" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check you connection and try again" -msgstr "Não é possível rejeitar o pagamentos. Verifique sua conexão e tente novamente" +msgid "Could not reject payment" +msgstr "Could not reject payment" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "Não foi possível enviar o pagamento" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "Não é possível atualizar carteira" @@ -331,6 +388,11 @@ msgstr "Criando Carteira…" msgid "Creating transaction" msgstr "Criando transação" +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" + #: public/views/modals/tx-details.html msgid "Date" msgstr "Data" @@ -370,6 +432,10 @@ msgstr "Desabilitado" msgid "Do not include private key in backup" msgstr "Do not include private key in backup" +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." + #: public/views/walletHome.html msgid "Download CSV file" msgstr "Download CSV file" @@ -378,11 +444,7 @@ msgstr "Download CSV file" msgid "Download backup" msgstr "Baixar backup" -#: public/views/includes/password.html -msgid "ENTER" -msgstr "ENTER" - -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Economy" msgstr "Economy" @@ -390,10 +452,6 @@ msgstr "Economy" msgid "Email Notifications" msgstr "Notificações por E-mail" -#: src/js/controllers/preferencesFee.js -msgid "Emergency" -msgstr "Emergency" - #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Criptografar Chave Privada" @@ -402,22 +460,18 @@ msgstr "Criptografar Chave Privada" msgid "Encrypted backup file saved" msgstr "Arquivo de backup criptografado salvo" -#: src/js/controllers/index.js -msgid "English" -msgstr "Inglês" - #: public/views/includes/password.html msgid "Enter your password" msgstr "Digite sua senha" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error at Wallet Service" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "Erro na criação da carteira" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "Erro criando carteira. Verifique sua conexão com a internet" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "Erro importando carteira:" @@ -444,15 +498,27 @@ msgstr "Fundos de férias com a família" msgid "Fee" msgstr "Fee" +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Fee Policy" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" msgstr "Buscando Informação de Pagamento" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "French" msgstr "Francês" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Funds are locked by pending spend proposals" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "Fundos recebidos" @@ -473,7 +539,7 @@ msgstr "Gerar novo endereço" msgid "Generating .csv file..." msgstr "Generating .csv file..." -#: src/js/controllers/index.js +#: public/views/translators.html msgid "German" msgstr "Alemão" @@ -489,7 +555,7 @@ msgstr "Configurações globais" msgid "Go back" msgstr "Go back" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Greek" msgstr "Grego" @@ -500,8 +566,9 @@ msgstr "Tem um Backup do Copay v 0.9?" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Hide Advanced options" -msgstr "Hide Advanced options" +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" #: src/js/controllers/index.js msgid "History" @@ -549,15 +616,35 @@ msgstr "Importando carteira…" msgid "Importing..." msgstr "Importando…" +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Incorrect address network" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Insufficient funds" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Insufficient funds for fee" + #: public/views/walletHome.html msgid "Invalid" msgstr "Invalid" -#: src/js/controllers/index.js +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Invalid address" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitation to share a Copay Wallet" + +#: public/views/translators.html msgid "Italian" msgstr "Italiano" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Japanese" msgstr "Japonês" @@ -570,6 +657,10 @@ msgstr "John" msgid "Join" msgstr "Participar" +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" + #: public/views/add.html msgid "Join shared wallet" msgstr "Associando carteira compartilhada" @@ -586,6 +677,14 @@ msgstr "Idioma" msgid "Learn more about Wallet Migration" msgstr "Saiba mais sobre Migração de Carteira" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effect. Please wait to create a new spend proposal" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effect. Please wait to remove this spend proposal" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "Fazer um pagamento para" @@ -634,14 +733,14 @@ msgstr "Meu endereço Bitcoin" msgid "Network" msgstr "Rede" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Network connection error" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "Nova Proposta de Pagamento" -#: public/views/modals/confirmation.html -msgid "No" -msgstr "Não" - #: public/views/walletHome.html msgid "No Private key" msgstr "No Private key" @@ -650,21 +749,30 @@ msgstr "No Private key" msgid "No transactions yet" msgstr "Nenhuma transação ainda" -#: src/js/controllers/preferencesFee.js +#: src/js/services/feeService.js msgid "Normal" msgstr "Normal" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Not authorized" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" msgstr "Inválido" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html msgid "Note" msgstr "Nota" +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + #: public/views/modals/tx-status.html msgid "OKAY" msgstr "OKAY" @@ -768,6 +876,10 @@ msgstr "Pagamento enviado!" msgid "Payment to" msgstr "Pagamento para" +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" msgstr "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" @@ -781,19 +893,27 @@ msgstr "Carteira Pessoal" msgid "Please enter the required fields" msgstr "Por favor, preencha os campos obrigatórios" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Please upgrade Copay to perform this action" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "Por favor, selecione seu arquivo de backup" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Portuguese" -msgstr "Portuguese" +msgstr "Português" #: public/views/walletHome.html msgid "Preferences" msgstr "Preferências" -#: src/js/controllers/preferencesFee.js +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Preparing backup..." + +#: src/js/services/feeService.js msgid "Priority" msgstr "Priority" @@ -813,6 +933,11 @@ msgstr "Receber" msgid "Received" msgstr "Recebido" +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Recipients" + #: public/views/walletHome.html msgid "Reconnecting to Wallet Service..." msgstr "Reconectando ao Serviço de Carteira…" @@ -856,6 +981,10 @@ msgstr "Obrigatório" msgid "Retrying..." msgstr "Repetindo…" +#: public/views/translators.html +msgid "Russian" +msgstr "Russian" + #: public/views/includes/password.html msgid "SET" msgstr "DEFINIR" @@ -972,8 +1101,13 @@ msgstr "Compartilhar Carteira" #: public/views/backup.html #: public/views/create.html #: public/views/join.html -msgid "Show Advanced options" -msgstr "Show Advanced options" +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejected by server" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -983,10 +1117,18 @@ msgstr "Pagamento assinado" msgid "Signing transaction" msgstr "Transação assinada" -#: src/js/controllers/index.js +#: public/views/translators.html msgid "Spanish" msgstr "Espanhol" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Spend proposal is not accepted" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Spend proposal not found" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1011,16 +1153,16 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "O pagamento foi criado mas não pode ser completado. Por favor, tente novamente a partir da tela inicial." #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." -msgstr "O pagamento foi criado mas não pode ser assinado. Por favor, tente novamente a partir da tela inicial." +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "The payment was created but could not be signed. Please try again from home screen" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "O pagamento foi removido pelo criador" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." -msgstr "O pagamento foi assinado mas não pode ser transmitido. Por favor, tente novamente a partir da tela inicial." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1030,6 +1172,10 @@ msgstr "A chave privada para esta carteira é criptografada. A exportação de u msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "The spend proposal is not pending" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1056,12 +1202,17 @@ msgid "Time" msgstr "Hora" #: public/views/walletHome.html +#: public/views/includes/output.html #: public/views/includes/transaction.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" msgstr "Para" +#: public/views/includes/output.html +msgid "Total" +msgstr "Total" + #: public/views/walletHome.html msgid "Total Locked Balance" msgstr "Saldo Total Bloqueado" @@ -1070,6 +1221,18 @@ msgstr "Saldo Total Bloqueado" msgid "Transaction" msgstr "Transação" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction already broadcasted" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Translation Credits" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Translators" + #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "Impossível enviar a proposta de transação" @@ -1095,6 +1258,11 @@ msgstr "Não confiável" msgid "Updating Wallet..." msgstr "Atualizando Carteira…" +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + #: public/views/preferencesAbout.html msgid "Version" msgstr "Versão" @@ -1139,6 +1307,7 @@ msgstr "Convite para Carteira" msgid "Wallet Invitation is not valid!" msgstr "O convite para carteira não é válido!" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "A carteira já existe" @@ -1147,18 +1316,34 @@ msgstr "A carteira já existe" msgid "Wallet incomplete and broken" msgstr "Carteira incompleta e quebrada" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Wallet is full" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Wallet is not complete" + #: public/views/create.html msgid "Wallet name" msgstr "Nome da carteira" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "Wallet service timed out. Check your Internet connection and your wallet service configuration." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Wallet not found" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet service not found" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "Atenção!" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Warning: this transaction has unconfirmed inputs" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "Senha errada" @@ -1219,10 +1404,6 @@ msgstr "configurações" msgid "too long!" msgstr "muito tempo!" -#: public/views/preferencesFee.html -msgid "{{fee.value}} bits per kB" -msgstr "{{fee.value}} bits per kB" - #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" msgstr "{{fee}} will be discounted for bitcoin networking fees" diff --git a/i18n/po/ru.po b/i18n/po/ru.po index 84d411ed4..1f547a52d 100644 --- a/i18n/po/ru.po +++ b/i18n/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Russian\n" "Language: ru\n" -"PO-Revision-Date: 2015-08-12 06:59-0400\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -90,6 +90,10 @@ msgstr "Альтернативная валюта" msgid "Amount" msgstr "Сумма" +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Сумма ниже возможного порога" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Amount in" @@ -140,6 +144,10 @@ msgstr "Создать резервную копию" msgid "Backup options" msgstr "Параметры резервной копии" +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Недействительное приглашение присоединиться к кошельку" + #: public/views/walletHome.html msgid "Before receiving funds, it is highly recommended you backup your wallet keys." msgstr "До получения средств, настоятельно рекомендуется, чтобы вы сделали резервную копию ключей кошелька." @@ -193,6 +201,10 @@ msgstr "ОТМЕНА" msgid "Cancel" msgstr "Отмена" +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Нельзя присоединиться к одному и тому же кошельку более одного раза" + #: public/views/modals/paypro.html msgid "Certified by" msgstr "Сертифицирован" @@ -201,10 +213,6 @@ msgstr "Сертифицирован" msgid "Changing wallet alias only affects the local wallet name." msgstr "Изменение псевдонима кошелька влияет только на название локального кошелька." -#: src/js/controllers/walletHome.js -msgid "Check your Internet connection and try again" -msgstr "Check your Internet connection and try again" - #: public/views/import.html msgid "Choose a backup file from your computer" msgstr "Выберите файл резервной копии с вашего компьютера" @@ -241,6 +249,22 @@ msgstr "Подтвердить" msgid "Confirmations" msgstr "Подтверждения" +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Совладелец кошелька уже присоединился" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Совладелец кошелька уже зарегистрирован" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Совладелец кошелька уже проголосовал по этому предложению платежа" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Несоответствие данных совладельца кошелька" + #: public/views/modals/copayers.html msgid "Copayers" msgstr "Совладельцы кошелька" @@ -264,20 +288,20 @@ msgid "Copy to clipboard" msgstr "Скопировать в буфер обмена" #: src/js/controllers/walletHome.js -msgid "Could not accept payment. Check your Internet connection and try again" -msgstr "Could not accept payment. Check your Internet connection and try again" +msgid "Could not accept payment" +msgstr "Не удалось принять платёж" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Не удалось получить доступ к службе кошелька: не найдена" #: src/js/controllers/walletHome.js -msgid "Could not broadcast payment. Check your Internet connection and try again" -msgstr "Could not broadcast payment. Check your Internet connection and try again" +msgid "Could not broadcast payment" +msgstr "Не удалось отправить платёж" -#: src/js/controllers/walletHome.js -msgid "Could not connect wallet service. Check your Internet connection and your wallet service configuration." -msgstr "Не удалось подключиться к службе кошелька. Проверьте своё Интернет-подключение и конфигурацию службы кошелька." - -#: src/js/controllers/walletHome.js -msgid "Could not create address. Check your Internet connection and try again" -msgstr "Could not create address. Check your Internet connection and try again" +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Не удалось создать адрес" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -292,8 +316,8 @@ msgid "Could not decrypt file, check your password" msgstr "Не удалось расшифровать файл, проверьте ваш пароль" #: src/js/controllers/walletHome.js -msgid "Could not delete payment proposal. Check your Internet connection and try again" -msgstr "Could not delete payment proposal. Check your Internet connection and try again" +msgid "Could not delete payment proposal" +msgstr "Не удалось удалить предложение платежа" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -311,23 +335,23 @@ msgstr "Не удалось импортировать. Проверьте вх msgid "Could not join using the specified extended private key" msgstr "Не удалось присоединиться используя указанный расширенный закрытый ключ" -#: src/js/controllers/join.js -msgid "Could not join wallet:" -msgstr "Не удалось присоединиться к кошельку:" +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Не удалось присоединиться к кошельку" #: src/js/controllers/walletHome.js msgid "Could not recognize a valid Bitcoin QR Code" msgstr "Не удалось распознать действительный Bitcoin QR-код" #: src/js/controllers/walletHome.js -msgid "Could not reject payment. Check your Internet connection and try again" -msgstr "Could not reject payment. Check your Internet connection and try again" +msgid "Could not reject payment" +msgstr "Не удалось отклонить платёж" #: src/js/controllers/walletHome.js msgid "Could not send payment" msgstr "Не удалось отправить платёж" -#: public/views/walletHome.html +#: src/js/controllers/index.js msgid "Could not update Wallet" msgstr "Не удалось обновить кошелёк" @@ -440,14 +464,14 @@ msgstr "Зашифрованный файл резервной копии сох msgid "Enter your password" msgstr "Введите свой пароль" +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Ошибка в службе кошелька" + #: src/js/services/profileService.js msgid "Error creating wallet" msgstr "Ошибка создания кошелька" -#: src/js/services/profileService.js -msgid "Error creating wallet. Check your internet connection" -msgstr "Ошибка создания кошелька. Проверьте своё Интернет-подключение" - #: src/js/services/profileService.js msgid "Error importing wallet:" msgstr "Ошибка импорта кошелька:" @@ -480,7 +504,7 @@ msgstr "Политика комиссии" #: public/views/walletHome.html msgid "Fee policy for this transaction" -msgstr "Fee policy for this transaction" +msgstr "Политика комиссий для этой транзакции" #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js @@ -491,6 +515,10 @@ msgstr "Извлечение информации платежа" msgid "French" msgstr "французский" +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Средства заблокированы ожидающим предложением платежа" + #: src/js/services/notificationsService.js msgid "Funds received" msgstr "Принят платёж" @@ -540,7 +568,7 @@ msgstr "Есть резервная копия из Copay v0.9?" #: public/views/join.html #: public/views/walletHome.html msgid "Hide advanced options" -msgstr "Hide advanced options" +msgstr "Скрыть дополнительные настройки" #: src/js/controllers/index.js msgid "History" @@ -588,10 +616,26 @@ msgstr "Импорт кошелька..." msgid "Importing..." msgstr "Импорт..." +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Неверный адрес" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Недостаточно средств" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Недостаточно средств на комиссию" + #: public/views/walletHome.html msgid "Invalid" msgstr "Недействительно" +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Неверный адрес" + #: src/js/controllers/copayers.js msgid "Invitation to share a Copay Wallet" msgstr "Приглашение присоединиться к кошельку Copay" @@ -633,6 +677,14 @@ msgstr "Язык" msgid "Learn more about Wallet Migration" msgstr "Узнайте больше о переносе кошелька" +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Действует блокировка. Пожалуйста, подождите, чтобы создать новое предложение платежа" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Действует блокировка. Пожалуйста, подождите, чтобы удалить это предложение платежа" + #: public/views/paymentUri.html msgid "Make a payment to" msgstr "Сделать платёж" @@ -681,6 +733,10 @@ msgstr "Мой адрес Bitcoin" msgid "Network" msgstr "Сеть" +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Ошибка сетевого подключения" + #: src/js/services/notificationsService.js msgid "New Payment Proposal" msgstr "Новое предложение платежа" @@ -697,6 +753,10 @@ msgstr "Транзакций пока не было" msgid "Normal" msgstr "Обычный" +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Не авторизован" + #: public/views/walletHome.html #: public/views/modals/customized-amount.html msgid "Not valid" @@ -708,6 +768,7 @@ msgstr "Не действительно" msgid "Note" msgstr "Примечание" +#: public/views/includes/alert.html #: public/views/includes/password.html msgid "OK" msgstr "Хорошо" @@ -817,7 +878,7 @@ msgstr "Платёж" #: public/views/walletHome.html msgid "Pending Confirmation" -msgstr "Pending Confirmation" +msgstr "Ожидание подтверждения" #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" @@ -832,6 +893,10 @@ msgstr "Личный кошелёк" msgid "Please enter the required fields" msgstr "Пожалуйста, заполните необходимые поля" +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Пожалуйста, обновите Copay для выполнения этого действия" + #: src/js/controllers/import.js msgid "Please, select your backup file" msgstr "Пожалуйста, выберите ваш файл резервной копии" @@ -916,6 +981,10 @@ msgstr "Необходимо" msgid "Retrying..." msgstr "Повторная попытка..." +#: public/views/translators.html +msgid "Russian" +msgstr "русский" + #: public/views/includes/password.html msgid "SET" msgstr "УСТАНОВИТЬ" @@ -1034,7 +1103,11 @@ msgstr "Общий бумажник" #: public/views/join.html #: public/views/walletHome.html msgid "Show advanced options" -msgstr "Show advanced options" +msgstr "Показать дополнительные настройки" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Подписи отклонены сервером" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -1048,6 +1121,14 @@ msgstr "Подписание транзакции" msgid "Spanish" msgstr "испанский" +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Предложение платежа не принято" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Предложение платежа не найдено" + #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -1072,16 +1153,16 @@ msgid "The payment was created but could not be completed. Please try again from msgstr "Платёж был создан, но не может быть завершен. Пожалуйста, попробуйте снова с главной страницы" #: src/js/controllers/walletHome.js -msgid "The payment was created but could not be signed. Please try again from home screen." -msgstr "Платёж был создан, но не может быть подписан. Пожалуйста, попробуйте снова с главной страницы." +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "Платёж был создан, но не может быть завершен. Пожалуйста, попробуйте снова с главной страницы" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" msgstr "Платёж был удалён его создателем" #: src/js/controllers/walletHome.js -msgid "The payment was signed but could not be broadcasted. Please try again from home screen." -msgstr "Платёж был подписан, но не может быть отправлен. Пожалуйста, попробуйте снова с главной страницы." +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "Платёж был подписан, но не может быть отправлен. Пожалуйста, попробуйте снова с главной страницы" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1091,6 +1172,10 @@ msgstr "Закрытый ключ для этого кошелька зашиф msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." msgstr "Программное обеспечение, которое вы собираетесь использовать, функционирует как цифровой кошелёк - бесплатный, с открытым исходным кодом и мультиподписью. Программное обеспечение не является счетом, где BitPay или других третьих сторон выступают в качестве финансовых посредников или хранителей ваших биткойнов. Хотя программное обеспечение прошло бета-тестирования и продолжает улучшаться путем обратной связи с пользователями открытого исходного кода и сообществом разработчиков, мы не можем гарантировать, что не будет никаких ошибок в программном обеспечении. Вы признаете, что используете это программное обеспечение по вашему собственному усмотрению и в соответствии со всеми применимыми законами. Вы ответственны за хранение ваших паролей, пары закрытых ключей, ПИН-кодов и любых других кодов, которые вы используете для доступа к программному обеспечению. ЕСЛИ ВЫ ПОТЕРЯЕТЕ ДОСТУП К ВАШЕМУ КОШЕЛЬКУ COPAY ИЛИ ВАШИМ ЗАШИФРОВАННЫМ ЗАКРЫТЫМ КЛЮЧАМ, И У ВАС НЕ ХРАНИЛАСЬ ОТДЕЛЬНО РЕЗЕРВНАЯ КОПИЯ ВАШЕГО БУМАЖНИКА И СООТВЕТСТВУЮЩИЙ ПАРОЛЬ, ВЫ ПРИЗНАЕТЕ И СОГЛАШАЕТЕСЬ, ЧТО ЛЮБЫЕ БИТКОЙНЫ, КОТОРЫЕ СВЯЗАННЫ С ЭТИМ КОШЕЛЬКОМ COPAY СТАНУТ НЕДОСТУПНЫМИ. Все транзакции являются необратимыми. Авторы программного обеспечения, работников и связанные лица Bitpay, владельцы авторских прав и BitPay, Inc. не могут восстановить ваши закрытые ключи или пароли, если вы потеряете или забудете их и не могут гарантировать подтверждение транзакций, поскольку они не имеют контроля над сетью Bitcoin. В максимальной степени, разрешенной законом это программное обеспечение предоставляется «как есть», и никаких заверений или гарантий не может быть дано - любого рода, явных или подразумеваемых, включая, но не ограничиваясь гарантии товарности, пригодности или конкретной цели и ненарушения. Вы принимаете на себя любые и все виды рисков, связанные с использованием программного обеспечения. Ни при каком случае авторы программного обеспечения, работников и связанные лица Bitpay, владельцы авторских прав, или BitPay, Inc. не несут ответственности за любые претензии, убытки или иной ответственности, будь то в действие контракта, правонарушения, или иным образом, проистекающей из, вне или в связи с программным обеспечением. Мы оставляем за собой право время от времени изменять этот отказ." +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "Предложение платежа не в ожидании" + #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -1136,6 +1221,10 @@ msgstr "Всего заблокировано средств" msgid "Transaction" msgstr "Транзакция" +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Транзакция уже отправлена" + #: public/views/translators.html msgid "Translation Credits" msgstr "Благодарность за перевод" @@ -1172,11 +1261,7 @@ msgstr "Обновление кошелька..." #: public/views/preferences.html #: public/views/walletHome.html msgid "Use Unconfirmed Funds" -msgstr "Use Unconfirmed Funds" - -#: public/views/modals/txp-details.html -msgid "Uses unconfirmed funds" -msgstr "Uses unconfirmed funds" +msgstr "Использовать неподтверждённые средства" #: public/views/preferencesAbout.html msgid "Version" @@ -1222,6 +1307,7 @@ msgstr "Приглашение присоединиться к кошельку" msgid "Wallet Invitation is not valid!" msgstr "Приглашение присоединиться к кошельку не действительно!" +#: src/js/services/bwsError.js #: src/js/services/profileService.js msgid "Wallet already exists" msgstr "Кошелёк уже существует" @@ -1230,18 +1316,34 @@ msgstr "Кошелёк уже существует" msgid "Wallet incomplete and broken" msgstr "Сбой: кошелёк не работает" +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Все уже присоединены" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Не все ещё присоединились" + #: public/views/create.html msgid "Wallet name" msgstr "Имя кошелька" -#: src/js/controllers/walletHome.js -msgid "Wallet service timed out. Check your Internet connection and your wallet service configuration." -msgstr "Истекло время ожидания службы кошелька. Проверьте своё Интернет-подключение и конфигурацию службы кошелька." +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Кошелёк не найден" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Служба кошелька не найдена" #: public/views/preferencesDeleteWallet.html msgid "Warning!" msgstr "Предупреждение!" +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Предупреждение: эта транзакция имеет неподтвержденные входы" + #: src/js/services/profileService.js msgid "Wrong password" msgstr "Неверный пароль" @@ -1304,7 +1406,7 @@ msgstr "слишком долго!" #: src/js/controllers/walletHome.js msgid "{{fee}} will be discounted for bitcoin networking fees" -msgstr "{{fee}} будет снижена до уровня комиссий сети" +msgstr "{{fee}} будет использовано для оплаты комиссии" #: src/js/controllers/importLegacy.js msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" From ec471bdba32550a21d66a91b1d69dcb6380630cd Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Aug 2015 16:47:10 -0300 Subject: [PATCH 130/158] Translates errors from send --- src/js/controllers/walletHome.js | 16 +++++----- src/js/services/bwsError.js | 53 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 7d1e340cb..50fa2a54b 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -249,7 +249,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); if (err) { $scope.loading = false; - $scope.error = bwsError.msg(err, gettext('Could not accept payment')); + $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not accept payment')); $scope.$digest(); } else { //if txp has required signatures then broadcast it @@ -261,7 +261,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = bwsError.msg(err, gettext('Could not broadcast payment')); + $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment')); $scope.$digest(); } else { $log.debug('Transaction signed and broadcasted') @@ -290,7 +290,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = bwsError.msg(err, gettext('Could not reject payment')); + $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not reject payment')); $scope.$digest(); } else { $modalInstance.close(txpr); @@ -311,7 +311,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi // Hacky: request tries to parse an empty response if (err && !(err.message && err.message.match(/Unexpected/))) { - $scope.error = bwsError.msg(err, gettext('Could not delete payment proposal')); + $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not delete payment proposal')); $scope.$digest(); return; } @@ -329,7 +329,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); $scope.loading = false; if (err) { - $scope.error = bwsError.msg(err, gettext('Could not broadcast payment')); + $scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment')); $scope.$digest(); } else { @@ -657,7 +657,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.setSendError = function(err) { var fc = profileService.focusedClient; var prefix = - fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); + fc.credentials.m > 1 ? gettextCatalog.getString('Could not create payment proposal') : gettextCatalog.getString('Could not send payment'); this.error = bwsError.msg(err, prefix); @@ -781,7 +781,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi profileService.lockFC(); self.setOngoingProcess(); if (err) { - err.message = bwsError.msg(err, gettext('The payment was created but could not be signed. Please try again from home screen')); + err.message = bwsError.msg(err, gettextCatalog.getString('The payment was created but could not be signed. Please try again from home screen')); return cb(err); } @@ -790,7 +790,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi fc.broadcastTxProposal(signedTx, function(err, btx, memo) { self.setOngoingProcess(); if (err) { - err.message = bwsError.msg(err, gettext('The payment was signed but could not be broadcasted. Please try again from home screen')); + err.message = bwsError.msg(err, gettextCatalog.getString('The payment was signed but could not be broadcasted. Please try again from home screen')); return cb(err); } if (memo) diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js index 3dec7ccc4..f91c3b541 100644 --- a/src/js/services/bwsError.js +++ b/src/js/services/bwsError.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('copayApp.services') - .factory('bwsError', function bwcErrorService($log, gettext) { + .factory('bwsError', function bwcErrorService($log, gettextCatalog) { var root = {}; root.msg = function(err, prefix) { @@ -10,85 +10,84 @@ angular.module('copayApp.services') if (err && err.code) { switch(err.code) { case 'CONNECTION_ERROR': - body = gettext('Network connection error'); + body = gettextCatalog.getString('Network connection error'); break; case 'NOT_FOUND': - body = gettext('Wallet service not found'); + body = gettextCatalog.getString('Wallet service not found'); break; case 'BAD_SIGNATURES': - body = gettext('Signatures rejected by server'); + body = gettextCatalog.getString('Signatures rejected by server'); break; case 'COPAYER_DATA_MISMATCH': - body = gettext('Copayer data mismatch'); + body = gettextCatalog.getString('Copayer data mismatch'); break; case 'COPAYER_IN_WALLET': - body = gettext('Copayer already in this wallet'); + body = gettextCatalog.getString('Copayer already in this wallet'); break; case 'COPAYER_REGISTERED': - body = gettext('Copayer already registered'); + body = gettextCatalog.getString('Copayer already registered'); break; case 'COPAYER_VOTED': - body = gettext('Copayer already voted on this spend proposal'); + body = gettextCatalog.getString('Copayer already voted on this spend proposal'); break; case 'DUST_AMOUNT': - body = gettext('Amount below dust threshold'); + body = gettextCatalog.getString('Amount below dust threshold'); break; case 'INCORRECT_ADDRESS_NETWORK': - body = gettext('Incorrect address network'); + body = gettextCatalog.getString('Incorrect address network'); break; case 'INSUFFICIENT_FUNDS': - body = gettext('Insufficient funds'); + body = gettextCatalog.getString('Insufficient funds'); break; case 'INSUFFICIENT_FUNDS_FOR_FEE': - body = gettext('Insufficient funds for fee'); + body = gettextCatalog.getString('Insufficient funds for fee'); break; case 'INVALID_ADDRESS': - body = gettext('Invalid address'); + body = gettextCatalog.getString('Invalid address'); break; case 'LOCKED_FUNDS': - body = gettext('Funds are locked by pending spend proposals'); + body = gettextCatalog.getString('Funds are locked by pending spend proposals'); break; case 'NOT_AUTHORIZED': - body = gettext('Not authorized'); + body = gettextCatalog.getString('Not authorized'); break; case 'TX_ALREADY_BROADCASTED': - body = gettext('Transaction already broadcasted'); + body = gettextCatalog.getString('Transaction already broadcasted'); break; case 'TX_CANNOT_CREATE': - body = gettext('Locktime in effect. Please wait to create a new spend proposal'); + body = gettextCatalog.getString('Locktime in effect. Please wait to create a new spend proposal'); break; case 'TX_CANNOT_REMOVE': - body = gettext('Locktime in effect. Please wait to remove this spend proposal'); + body = gettextCatalog.getString('Locktime in effect. Please wait to remove this spend proposal'); break; case 'TX_NOT_ACCEPTED': - body = gettext('Spend proposal is not accepted'); + body = gettextCatalog.getString('Spend proposal is not accepted'); break; case 'TX_NOT_FOUND': - body = gettext('Spend proposal not found'); + body = gettextCatalog.getString('Spend proposal not found'); break; case 'TX_NOT_PENDING': - body = gettext('The spend proposal is not pending'); + body = gettextCatalog.getString('The spend proposal is not pending'); break; case 'UPGRADE_NEEDED': - body = gettext('Please upgrade Copay to perform this action'); + body = gettextCatalog.getString('Please upgrade Copay to perform this action'); break; case 'WALLET_ALREADY_EXISTS': - body = gettext('Wallet already exists'); + body = gettextCatalog.getString('Wallet already exists'); break; case 'WALLET_FULL': - body = gettext('Wallet is full'); + body = gettextCatalog.getString('Wallet is full'); break; case 'WALLET_NOT_COMPLETE': - body = gettext('Wallet is not complete'); + body = gettextCatalog.getString('Wallet is not complete'); break; case 'WALLET_NOT_FOUND': - body = gettext('Wallet not found'); + body = gettextCatalog.getString('Wallet not found'); break; } } var msg = prefix + ( body ? ': ' + body : ''); - $log.warn("BWC ERROR:" + msg); return msg; }; From f3e88ae83abad12f2a4e545406a691a08f39742c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 13 Aug 2015 16:48:13 -0300 Subject: [PATCH 131/158] New release v1.1.3 --- cordova/config.xml | 6 +++--- cordova/ios/Copay-Info.plist | 4 ++-- cordova/wp/Package.appxmanifest | 2 +- package.json | 2 +- webkitbuilds/.desktop | 2 +- webkitbuilds/setup-win32.iss | 2 +- webkitbuilds/setup-win64.iss | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cordova/config.xml b/cordova/config.xml index 7e2d0f1e4..46c8cf90c 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.1.3" + android-versionCode="40" + ios-CFBundleVersion="1.1.3"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 8b6a16678..1e7b16959 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.2 + 1.1.3 CFBundleSignature ???? CFBundleVersion - 1.1.2 + 1.1.3 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index ebb44af4a..8585fc499 100644 --- a/cordova/wp/Package.appxmanifest +++ b/cordova/wp/Package.appxmanifest @@ -1,6 +1,6 @@  - + Copay Wallet diff --git a/package.json b/package.json index 70d5546ac..f11aa6a8e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.1.2", + "version": "1.1.3", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 438fe9b3d..d6866f041 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.0.2 +Version=1.1.3 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win32.iss b/webkitbuilds/setup-win32.iss index 1cc2132ff..78c98fa6e 100755 --- a/webkitbuilds/setup-win32.iss +++ b/webkitbuilds/setup-win32.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.1.2" +#define MyAppVersion "1.1.3" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" diff --git a/webkitbuilds/setup-win64.iss b/webkitbuilds/setup-win64.iss index 1cac9d798..a22fc0dcd 100755 --- a/webkitbuilds/setup-win64.iss +++ b/webkitbuilds/setup-win64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.1.2" +#define MyAppVersion "1.1.3" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" From 6b73e7e05465cda8a537f51bc208e9bdec469d01 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 14 Aug 2015 09:51:42 -0300 Subject: [PATCH 132/158] Updates po files --- i18n/docs/updateinfo_es.txt | 4 +- i18n/docs/updateinfo_fr.txt | 4 +- i18n/docs/updateinfo_ja.txt | 4 +- i18n/po/es.po | 2 +- i18n/po/fr.po | 4 +- i18n/po/it.po | 84 ++++++++++++++++++------------------ i18n/po/ja.po | 2 +- i18n/po/ru.po | 2 +- webkitbuilds/setup-win32.iss | 2 +- webkitbuilds/setup-win64.iss | 2 +- 10 files changed, 55 insertions(+), 55 deletions(-) diff --git a/i18n/docs/updateinfo_es.txt b/i18n/docs/updateinfo_es.txt index 05c8a50ae..edd1cff7d 100644 --- a/i18n/docs/updateinfo_es.txt +++ b/i18n/docs/updateinfo_es.txt @@ -1,5 +1,5 @@ -* Adaptive fee levels based on bitcoin network load -* Option to prevent creating transactions with unconfirmed inputs +* Niveles de tasa adaptables en base a la carga de la red bitcoin +* Opción para evitar la creación de transacciones con entradas sin confirmar * Opciones de envío avanzado * Nuevos idiomas: Italiano, Ruso, and Griego * Corrección de errores menores diff --git a/i18n/docs/updateinfo_fr.txt b/i18n/docs/updateinfo_fr.txt index d6e6fbad1..5b1238c23 100644 --- a/i18n/docs/updateinfo_fr.txt +++ b/i18n/docs/updateinfo_fr.txt @@ -1,5 +1,5 @@ -* Adaptive fee levels based on bitcoin network load -* Option to prevent creating transactions with unconfirmed inputs +* Les frais sont maintenant calculés dynamiquement, en fonction de la charge du réseau Bitcoin +* Ajout d'une option permettant d'éviter la création de transactions avec des entrées non confirmées * Ajout d'options d'envois avancés * Ajout de langues : Italien, Russe et Grec * Corrections de bugs mineurs diff --git a/i18n/docs/updateinfo_ja.txt b/i18n/docs/updateinfo_ja.txt index 3ccbee5fe..f84c8c5ed 100644 --- a/i18n/docs/updateinfo_ja.txt +++ b/i18n/docs/updateinfo_ja.txt @@ -1,5 +1,5 @@ -* Adaptive fee levels based on bitcoin network load -* Option to prevent creating transactions with unconfirmed inputs +■ ネットワーク混雑状況に自動的に合わせる手数料設定 +■ 未承認資金の使用を禁止するオプション ■ 詳細な送金設定の追加 ■ イタリア語、ロシア語、ギリシャ語の言語選択を追加 ■ バグの修正 diff --git a/i18n/po/es.po b/i18n/po/es.po index 007f595ae..f850efd92 100644 --- a/i18n/po/es.po +++ b/i18n/po/es.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Spanish\n" "Language: es\n" -"PO-Revision-Date: 2015-08-13 09:15-0400\n" +"PO-Revision-Date: 2015-08-14 02:33-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/fr.po b/i18n/po/fr.po index 75426cd65..fc829fd30 100644 --- a/i18n/po/fr.po +++ b/i18n/po/fr.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: French\n" "Language: fr\n" -"PO-Revision-Date: 2015-08-13 09:15-0400\n" +"PO-Revision-Date: 2015-08-14 02:33-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -1210,7 +1210,7 @@ msgstr "Ce portefeuille n'est pas enregistré dans le Bitcore Wallet Service (BW #: public/views/modals/txp-details.html msgid "Time" -msgstr "Heure" +msgstr "Ancienneté" #: public/views/walletHome.html #: public/views/includes/output.html diff --git a/i18n/po/it.po b/i18n/po/it.po index cda10b4b3..bec7713b2 100644 --- a/i18n/po/it.po +++ b/i18n/po/it.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Italian\n" "Language: it\n" -"PO-Revision-Date: 2015-08-13 09:15-0400\n" +"PO-Revision-Date: 2015-08-14 02:34-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -289,19 +289,19 @@ msgstr "Copia negli appunti" #: src/js/controllers/walletHome.js msgid "Could not accept payment" -msgstr "Could not accept payment" +msgstr "Impossibile accettare il pagamento" #: src/js/controllers/index.js msgid "Could not access Wallet Service: Not found" -msgstr "Could not access Wallet Service: Not found" +msgstr "Impossibile accedere al Wallet Service: non trovato" #: src/js/controllers/walletHome.js msgid "Could not broadcast payment" -msgstr "Could not broadcast payment" +msgstr "Impossibile trasmettere il pagamento" #: src/js/services/addressService.js msgid "Could not create address" -msgstr "Could not create address" +msgstr "Impossibile creare un indirizzo" #: src/js/controllers/walletHome.js msgid "Could not create payment proposal" @@ -317,7 +317,7 @@ msgstr "Impossibile decrittografare il file, controlla la tua password" #: src/js/controllers/walletHome.js msgid "Could not delete payment proposal" -msgstr "Could not delete payment proposal" +msgstr "Impossibile eliminare la proposta di pagamento" #: src/js/controllers/walletHome.js msgid "Could not fetch payment information" @@ -434,7 +434,7 @@ msgstr "Non includere la chiave privata nel backup" #: public/views/translators.html msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." -msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Non vedi la tua lingua su Crowdin? Contatta il proprietario su Crowdin! Ci piacerebbe supportare la lingua." #: public/views/walletHome.html msgid "Download CSV file" @@ -446,7 +446,7 @@ msgstr "Scarica il backup" #: src/js/services/feeService.js msgid "Economy" -msgstr "Economy" +msgstr "Economia" #: public/views/preferences.html msgid "Email Notifications" @@ -466,7 +466,7 @@ msgstr "Inserisci la tua password" #: src/js/controllers/index.js msgid "Error at Wallet Service" -msgstr "Error at Wallet Service" +msgstr "Errore del Wallet Service" #: src/js/services/profileService.js msgid "Error creating wallet" @@ -504,7 +504,7 @@ msgstr "Politica delle tasse" #: public/views/walletHome.html msgid "Fee policy for this transaction" -msgstr "Fee policy for this transaction" +msgstr "Commissioni per questa transazione" #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js @@ -517,7 +517,7 @@ msgstr "Francese" #: src/js/services/bwsError.js msgid "Funds are locked by pending spend proposals" -msgstr "Funds are locked by pending spend proposals" +msgstr "I fondi sono bloccati in attesa della proposta di pagamento" #: src/js/services/notificationsService.js msgid "Funds received" @@ -568,7 +568,7 @@ msgstr "Hai un Backup da Copay v0.9?" #: public/views/join.html #: public/views/walletHome.html msgid "Hide advanced options" -msgstr "Hide advanced options" +msgstr "Nascondi opzioni avanzate" #: src/js/controllers/index.js msgid "History" @@ -618,15 +618,15 @@ msgstr "Importando..." #: src/js/services/bwsError.js msgid "Incorrect address network" -msgstr "Incorrect address network" +msgstr "Indirizzo della rete incorretto" #: src/js/services/bwsError.js msgid "Insufficient funds" -msgstr "Insufficient funds" +msgstr "Fondi insufficienti" #: src/js/services/bwsError.js msgid "Insufficient funds for fee" -msgstr "Insufficient funds for fee" +msgstr "Fondi insufficienti per la commissione" #: public/views/walletHome.html msgid "Invalid" @@ -634,7 +634,7 @@ msgstr "Invalido" #: src/js/services/bwsError.js msgid "Invalid address" -msgstr "Invalid address" +msgstr "Indirizzo non valido" #: src/js/controllers/copayers.js msgid "Invitation to share a Copay Wallet" @@ -679,11 +679,11 @@ msgstr "Ulteriori informazioni sulla migrazione di portafoglio" #: src/js/services/bwsError.js msgid "Locktime in effect. Please wait to create a new spend proposal" -msgstr "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effetto. Si prega di attendere per creare una nuova proposta di pagamento" #: src/js/services/bwsError.js msgid "Locktime in effect. Please wait to remove this spend proposal" -msgstr "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effetto. Si prega di attendere per rimuovere questa proposta di pagamento" #: public/views/paymentUri.html msgid "Make a payment to" @@ -735,7 +735,7 @@ msgstr "Network" #: src/js/services/bwsError.js msgid "Network connection error" -msgstr "Network connection error" +msgstr "Errore di connessione alla rete" #: src/js/services/notificationsService.js msgid "New Payment Proposal" @@ -751,11 +751,11 @@ msgstr "Ancora nessuna transazione" #: src/js/services/feeService.js msgid "Normal" -msgstr "Normal" +msgstr "Normale" #: src/js/services/bwsError.js msgid "Not authorized" -msgstr "Not authorized" +msgstr "Non autorizzato" #: public/views/walletHome.html #: public/views/modals/customized-amount.html @@ -878,7 +878,7 @@ msgstr "Pagamento a" #: public/views/walletHome.html msgid "Pending Confirmation" -msgstr "Pending Confirmation" +msgstr "In attesa di conferma" #: public/views/preferencesDeleteWallet.html msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" @@ -895,7 +895,7 @@ msgstr "Per favore completa i campi richiesti" #: src/js/services/bwsError.js msgid "Please upgrade Copay to perform this action" -msgstr "Please upgrade Copay to perform this action" +msgstr "Si prega di aggiornare Copay per eseguire questa azione" #: src/js/controllers/import.js msgid "Please, select your backup file" @@ -911,11 +911,11 @@ msgstr "Preferenze" #: src/js/controllers/backup.js msgid "Preparing backup..." -msgstr "Preparing backup..." +msgstr "Preparando il backup..." #: src/js/services/feeService.js msgid "Priority" -msgstr "Priority" +msgstr "Priorità" #: public/views/modals/customized-amount.html msgid "QR Code" @@ -983,7 +983,7 @@ msgstr "Sto riprovando..." #: public/views/translators.html msgid "Russian" -msgstr "Russian" +msgstr "Russo" #: public/views/includes/password.html msgid "SET" @@ -1103,11 +1103,11 @@ msgstr "Portafoglio Condiviso" #: public/views/join.html #: public/views/walletHome.html msgid "Show advanced options" -msgstr "Show advanced options" +msgstr "Mostra opzioni avanzate" #: src/js/services/bwsError.js msgid "Signatures rejected by server" -msgstr "Signatures rejected by server" +msgstr "Firme rifiutate dal server" #: src/js/controllers/walletHome.js msgid "Signing payment" @@ -1123,11 +1123,11 @@ msgstr "Spagnolo" #: src/js/services/bwsError.js msgid "Spend proposal is not accepted" -msgstr "Spend proposal is not accepted" +msgstr "La proposta di pagamento non è accettata" #: src/js/services/bwsError.js msgid "Spend proposal not found" -msgstr "Spend proposal not found" +msgstr "Proposta di pagamento non trovata" #: src/js/controllers/copayers.js #: src/js/controllers/import.js @@ -1154,7 +1154,7 @@ msgstr "Il pagamento è stato creato ma è stato impossibile completarlo. Per fa #: src/js/controllers/walletHome.js msgid "The payment was created but could not be signed. Please try again from home screen" -msgstr "The payment was created but could not be signed. Please try again from home screen" +msgstr "Il pagamento è stato creato ma è stato impossibile firmarlo. Per favore prova di nuovo dalla schermata iniziale" #: public/views/modals/txp-details.html msgid "The payment was removed by creator" @@ -1162,7 +1162,7 @@ msgstr "Il pagamento è stato rimosso dal creatore" #: src/js/controllers/walletHome.js msgid "The payment was signed but could not be broadcasted. Please try again from home screen" -msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "Il pagamento è stato firmato ma non è stato possibile trasmetterlo. Per favore prova di nuovo dalla schermata principale" #: public/views/backup.html msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." @@ -1174,7 +1174,7 @@ msgstr "Il software che stai per utilizzare è un portafoglio digitale gratis, o #: src/js/services/bwsError.js msgid "The spend proposal is not pending" -msgstr "The spend proposal is not pending" +msgstr "La proposta di pagamento non è in sospeso" #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js @@ -1223,15 +1223,15 @@ msgstr "Transazione" #: src/js/services/bwsError.js msgid "Transaction already broadcasted" -msgstr "Transaction already broadcasted" +msgstr "Transazione già trasmessa" #: public/views/translators.html msgid "Translation Credits" -msgstr "Translation Credits" +msgstr "Ringraziamenti per la traduzione" #: public/views/preferencesAbout.html msgid "Translators" -msgstr "Translators" +msgstr "Traduttori" #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" @@ -1261,7 +1261,7 @@ msgstr "Aggiornamento portafoglio..." #: public/views/preferences.html #: public/views/walletHome.html msgid "Use Unconfirmed Funds" -msgstr "Use Unconfirmed Funds" +msgstr "Usa i fondi non confermati" #: public/views/preferencesAbout.html msgid "Version" @@ -1318,11 +1318,11 @@ msgstr "Portafoglio incompleto e danneggiato" #: src/js/services/bwsError.js msgid "Wallet is full" -msgstr "Wallet is full" +msgstr "Portafoglio è pieno" #: src/js/services/bwsError.js msgid "Wallet is not complete" -msgstr "Wallet is not complete" +msgstr "Portafoglio non è completo" #: public/views/create.html msgid "Wallet name" @@ -1330,11 +1330,11 @@ msgstr "Nome Portafoglio" #: src/js/services/bwsError.js msgid "Wallet not found" -msgstr "Wallet not found" +msgstr "Portafoglio non trovato" #: src/js/services/bwsError.js msgid "Wallet service not found" -msgstr "Wallet service not found" +msgstr "Wallet service non trovato" #: public/views/preferencesDeleteWallet.html msgid "Warning!" @@ -1342,7 +1342,7 @@ msgstr "Attenzione!" #: public/views/modals/txp-details.html msgid "Warning: this transaction has unconfirmed inputs" -msgstr "Warning: this transaction has unconfirmed inputs" +msgstr "Attenzione: questa transazione ha inputs non confermati" #: src/js/services/profileService.js msgid "Wrong password" diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 00febc4fa..5ac9f8778 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Japanese\n" "Language: ja\n" -"PO-Revision-Date: 2015-08-13 09:15-0400\n" +"PO-Revision-Date: 2015-08-14 02:34-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/ru.po b/i18n/po/ru.po index 1f547a52d..5808872c5 100644 --- a/i18n/po/ru.po +++ b/i18n/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Russian\n" "Language: ru\n" -"PO-Revision-Date: 2015-08-13 09:15-0400\n" +"PO-Revision-Date: 2015-08-14 02:34-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/webkitbuilds/setup-win32.iss b/webkitbuilds/setup-win32.iss index 78c98fa6e..22ad34238 100755 --- a/webkitbuilds/setup-win32.iss +++ b/webkitbuilds/setup-win32.iss @@ -35,7 +35,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ [Files] Source: "copay\win32\copay.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "copay\win32\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion +Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/webkitbuilds/setup-win64.iss b/webkitbuilds/setup-win64.iss index a22fc0dcd..8a3daed85 100755 --- a/webkitbuilds/setup-win64.iss +++ b/webkitbuilds/setup-win64.iss @@ -35,7 +35,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ [Files] Source: "copay\win64\copay.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "copay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion +Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] From a4731e7f06160960d143526cd866bfdcb5eae763 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 14 Aug 2015 16:56:13 -0300 Subject: [PATCH 133/158] Fix txp modals for single outputs --- public/views/modals/txp-details.html | 8 ++++---- src/js/controllers/walletHome.js | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index dc8c683bd..9a504c217 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -14,15 +14,15 @@

    Details

      -
      -
      -
      @@ -131,7 +131,7 @@ ng-show="tx.status=='broadcasted'" translate> Payment sent!
    -
    Payment finally rejected
    diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 50fa2a54b..1f633431c 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -204,6 +204,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var action = lodash.find(tx.actions, { copayerId: fc.credentials.copayerId }); + tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; + tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; + tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; $scope.tx = tx; if (!action && tx.status == 'pending') $scope.tx.pendingForUs = true; From 000bef4aec68b657927f5bff2707a85da6defea6 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sun, 16 Aug 2015 01:05:43 +0900 Subject: [PATCH 134/158] fixed crowdin download script + latest translation --- i18n/crowdin_download.js | 289 +++++-- i18n/docs/appstore_it.txt | 23 + i18n/docs/appstore_ko.txt | 23 + i18n/docs/appstore_ru.txt | 23 + i18n/docs/appstore_tr.txt | 23 + i18n/docs/appstore_zh.txt | 23 + i18n/docs/updateinfo_de.txt | 5 + i18n/docs/updateinfo_it.txt | 5 + i18n/docs/updateinfo_nl.txt | 5 + i18n/docs/updateinfo_ru.txt | 5 + i18n/docs/updateinfo_tr.txt | 10 +- i18n/docs/updateinfo_zh.txt | 5 + i18n/po/ja.po | 2 +- i18n/po/ko.po | 1414 +++++++++++++++++++++++++++++++++++ i18n/po/nl.po | 1414 +++++++++++++++++++++++++++++++++++ i18n/po/ru.po | 6 +- i18n/po/sq.po | 1414 +++++++++++++++++++++++++++++++++++ 17 files changed, 4607 insertions(+), 82 deletions(-) create mode 100644 i18n/docs/appstore_it.txt create mode 100644 i18n/docs/appstore_ko.txt create mode 100644 i18n/docs/appstore_ru.txt create mode 100644 i18n/docs/appstore_tr.txt create mode 100644 i18n/docs/appstore_zh.txt create mode 100644 i18n/docs/updateinfo_de.txt create mode 100644 i18n/docs/updateinfo_it.txt create mode 100644 i18n/docs/updateinfo_nl.txt create mode 100644 i18n/docs/updateinfo_ru.txt create mode 100644 i18n/docs/updateinfo_zh.txt create mode 100644 i18n/po/ko.po create mode 100644 i18n/po/nl.po create mode 100644 i18n/po/sq.po diff --git a/i18n/crowdin_download.js b/i18n/crowdin_download.js index 5470a2a9e..84f3597e1 100644 --- a/i18n/crowdin_download.js +++ b/i18n/crowdin_download.js @@ -2,6 +2,21 @@ 'use strict'; +if (process.argv[2]) { + var no_key = (process.argv[2].toLowerCase() == '--nokey') + if (no_key == false) { + console.log('Incorrect arg. Please use --nokey if you would like to download without api key.'); + process.exit(1); + }; +} else { + var no_key = false; + console.log('\n' + + 'Please note: If you do not have the crowdin API key and would like to download the ' + + 'translations without building anyways, please make sure your English files are the same ' + + 'version as crowdin, and then run this script with --nokey\n\n' + + 'eg. "node crowdin_download.js --nokey"\n\n'); +}; + var fs = require('fs'); var path = require('path'); var https = require('https'); @@ -21,85 +36,213 @@ catch (e) { process.exit(1); } -// Download most recent translations for all languages. -https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { - var data = [], dataLen = 0; - - res.on('data', function(chunk) { - data.push(chunk); - dataLen += chunk.length; - }).on('end', function() { - var buf = new Buffer(dataLen); - for (var i=0, len = data.length, pos = 0; i < len; i++) { - data[i].copy(buf, pos); - pos += data[i].length; - }; - var zip = new AdmZip(buf); - zip.extractAllTo('./', true); - console.log('Done extracting ZIP file.'); +if (no_key == false) { // Reminder: Any changes to the script below must also be made to the else clause and vice versa. + + try { + // obtain the crowdin api key + var crowdin_api_key = fs.readFileSync(path.join(__dirname, 'crowdin_api_key.txt'), 'utf8') + } catch (e) { + console.log('### ERROR ### You do not have the crowdin api key in ./crowdin_api_key.txt so the translation build has failed.\nFor download only use --nokey.'); + process.exit(1); + }; + + // This call will tell the server to generate a new zip file for you based on most recent translations. + https.get('https://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key, function(res) { + + console.log('Export Got response: ' + res.statusCode); + + res.on('data', function(chunk) { + var resxml = chunk.toString('utf8'); + console.log(resxml); - var files = fs.readdirSync('./docs'); - - for (var i in files) { - if (files[i].slice(0,9) == 'appstore_' && files[i].slice(-4) == '.txt' && files[i] != 'appstore_en.txt') { - var english_file = fs.readFileSync(local_file_name2, 'utf8'); - var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') - if (compare_file == english_file) { - fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); - }; - }; - if (files[i].slice(0,11) == 'updateinfo_' && files[i].slice(-4) == '.txt' && files[i] != 'updateinfo_en.txt') { - var english_file = fs.readFileSync(local_file_name3, 'utf8'); - var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') - if (compare_file == english_file) { - fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); - }; - }; + if (resxml.indexOf('status="skipped"') >= 0) { + console.log('Translation build was skipped due to either:\n' + + '1. No changes since last translation build, or\n' + + '2. API limit of once per 30 minutes has not been waited.\n\n' + + 'Since we can not guarantee that translations have been built properly, this script will end here.\n' + + 'Log in to Copay\'s Crowdin Settings and click the "Build Project" button to assure it is built recently, and then run this ' + + 'script again with the --nokey arg to download translations without checking if built.'); + process.exit(1); }; - console.log('Cleaned out completely untranslated appstore docs.'); - - var files = fs.readdirSync('./po'); - - for (var i in files) { - if (files[i] != 'template.pot') { - var po_file = fs.readFileSync(path.join(__dirname, 'po/' + files[i]), 'utf8'); - var po_array = po_file.split('\n'); - for (var j in po_array) { - if (po_array[j].slice(0,5) == 'msgid') { - var source_text = po_array[j].slice(5); - } else if (po_array[j].slice(0,6) == 'msgstr') { - var translate_text = po_array[j].slice(6); - // if a line is not == English, it means there is translation. Keep this file. - if (source_text != translate_text) { - // erase email addresses of last translator for privacy - po_file = po_file.replace(/ <.+@.+\..+>/, '') - fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_file); - - // split the file into 3 parts, before locale, locale, and after locale. - var lang_pos = po_file.search('"Language: ') + 11; - var po_start = po_file.slice(0,lang_pos); - var po_locale = po_file.slice(lang_pos,lang_pos + 5); - var po_end = po_file.slice(lang_pos + 5); - - // check for underscore, if it's there, only take the first 2 letters and reconstruct the po file. - if (po_locale.search('_') > 0) { - fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_start + po_locale.slice(0,2) + po_end); - po_start = ''; - po_locale = ''; - po_end = ''; + // Download most recent translations for all languages. + https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { + var data = [], dataLen = 0; + + res.on('data', function(chunk) { + data.push(chunk); + dataLen += chunk.length; + }).on('end', function() { + var buf = new Buffer(dataLen); + for (var i=0, len = data.length, pos = 0; i < len; i++) { + data[i].copy(buf, pos); + pos += data[i].length; + }; + var zip = new AdmZip(buf); + zip.extractAllTo('./', true); + console.log('Done extracting ZIP file.'); + + var files = fs.readdirSync('./docs'); + + for (var i in files) { + debugger; + if (files[i].slice(0,9) == 'appstore_' && files[i].slice(-4) == '.txt' && files[i] != 'appstore_en.txt') { + var english_file = fs.readFileSync(local_file_name2, 'utf8'); + var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') + english_file = english_file.replace(/\r\n/g, '\n'); + compare_file = compare_file.replace(/\r\n/g, '\n'); + if (compare_file == english_file) { + fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); + }; + }; + if (files[i].slice(0,11) == 'updateinfo_' && files[i].slice(-4) == '.txt' && files[i] != 'updateinfo_en.txt') { + var english_file = fs.readFileSync(local_file_name3, 'utf8'); + var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') + english_file = english_file.replace(/\r\n/g, '\n'); + compare_file = compare_file.replace(/\r\n/g, '\n'); + if (compare_file == english_file) { + fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); }; - break; }; }; - if (j == po_array.length - 1) { // All strings are exactly identical to English. Delete po file. - fs.unlinkSync(path.join(__dirname, 'po/' + files[i])); + + console.log('Cleaned out completely untranslated appstore docs.'); + + var files = fs.readdirSync('./po'); + + for (var i in files) { + if (files[i] != 'template.pot') { + var po_file = fs.readFileSync(path.join(__dirname, 'po/' + files[i]), 'utf8'); + var po_array = po_file.split('\n'); + for (var j in po_array) { + if (po_array[j].slice(0,5) == 'msgid') { + var source_text = po_array[j].slice(5); + } else if (po_array[j].slice(0,6) == 'msgstr') { + var translate_text = po_array[j].slice(6); + // if a line is not == English, it means there is translation. Keep this file. + if (source_text != translate_text) { + // erase email addresses of last translator for privacy + po_file = po_file.replace(/ <.+@.+\..+>/, '') + fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_file); + + // split the file into 3 parts, before locale, locale, and after locale. + var lang_pos = po_file.search('"Language: ') + 11; + var po_start = po_file.slice(0,lang_pos); + var po_locale = po_file.slice(lang_pos,lang_pos + 5); + var po_end = po_file.slice(lang_pos + 5); + + // check for underscore, if it's there, only take the first 2 letters and reconstruct the po file. + if (po_locale.search('_') > 0) { + fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_start + po_locale.slice(0,2) + po_end); + po_start = ''; + po_locale = ''; + po_end = ''; + }; + break; + }; + }; + if (j == po_array.length - 1) { // All strings are exactly identical to English. Delete po file. + fs.unlinkSync(path.join(__dirname, 'po/' + files[i])); + }; + }; + }; + }; + + console.log('Cleaned out completely untranslated po files.'); + + }); + }); + }); + }).on('error', function(e) { + console.log('Export Got error: ' + e.message); + }); + +} else { // Reminder: Any changes to the script below must also be made to the above and vice versa. + + // Download most recent translations for all languages. + https.get('https://crowdin.com/download/project/' + crowdin_identifier + '.zip', function(res) { + var data = [], dataLen = 0; + + res.on('data', function(chunk) { + data.push(chunk); + dataLen += chunk.length; + }).on('end', function() { + var buf = new Buffer(dataLen); + for (var i=0, len = data.length, pos = 0; i < len; i++) { + data[i].copy(buf, pos); + pos += data[i].length; + }; + var zip = new AdmZip(buf); + zip.extractAllTo('./', true); + console.log('Done extracting ZIP file.'); + + var files = fs.readdirSync('./docs'); + + for (var i in files) { + if (files[i].slice(0,9) == 'appstore_' && files[i].slice(-4) == '.txt' && files[i] != 'appstore_en.txt') { + var english_file = fs.readFileSync(local_file_name2, 'utf8'); + var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') + english_file = english_file.replace(/\r\n/g, '\n'); + compare_file = compare_file.replace(/\r\n/g, '\n'); + if (compare_file == english_file) { + fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); + }; + }; + if (files[i].slice(0,11) == 'updateinfo_' && files[i].slice(-4) == '.txt' && files[i] != 'updateinfo_en.txt') { + var english_file = fs.readFileSync(local_file_name3, 'utf8'); + var compare_file = fs.readFileSync(path.join(__dirname, 'docs/' + files[i]), 'utf8') + english_file = english_file.replace(/\r\n/g, '\n'); + compare_file = compare_file.replace(/\r\n/g, '\n'); + if (compare_file == english_file) { + fs.unlinkSync(path.join(__dirname, 'docs/' + files[i])); }; }; }; - }; - - console.log('Cleaned out completely untranslated po files.'); - - }); -}); + + console.log('Cleaned out completely untranslated appstore docs.'); + + var files = fs.readdirSync('./po'); + + for (var i in files) { + if (files[i] != 'template.pot') { + var po_file = fs.readFileSync(path.join(__dirname, 'po/' + files[i]), 'utf8'); + var po_array = po_file.split('\n'); + for (var j in po_array) { + if (po_array[j].slice(0,5) == 'msgid') { + var source_text = po_array[j].slice(5); + } else if (po_array[j].slice(0,6) == 'msgstr') { + var translate_text = po_array[j].slice(6); + // if a line is not == English, it means there is translation. Keep this file. + if (source_text != translate_text) { + // erase email addresses of last translator for privacy + po_file = po_file.replace(/ <.+@.+\..+>/, '') + fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_file); + + // split the file into 3 parts, before locale, locale, and after locale. + var lang_pos = po_file.search('"Language: ') + 11; + var po_start = po_file.slice(0,lang_pos); + var po_locale = po_file.slice(lang_pos,lang_pos + 5); + var po_end = po_file.slice(lang_pos + 5); + + // check for underscore, if it's there, only take the first 2 letters and reconstruct the po file. + if (po_locale.search('_') > 0) { + fs.writeFileSync(path.join(__dirname, 'po/' + files[i]), po_start + po_locale.slice(0,2) + po_end); + po_start = ''; + po_locale = ''; + po_end = ''; + }; + break; + }; + }; + if (j == po_array.length - 1) { // All strings are exactly identical to English. Delete po file. + fs.unlinkSync(path.join(__dirname, 'po/' + files[i])); + }; + }; + }; + }; + + console.log('Cleaned out completely untranslated po files.'); + + }); + }); +}; diff --git a/i18n/docs/appstore_it.txt b/i18n/docs/appstore_it.txt new file mode 100644 index 000000000..242f699cc --- /dev/null +++ b/i18n/docs/appstore_it.txt @@ -0,0 +1,23 @@ +Metti al sicuro i tuoi bitcoins, alle tue condizioni, con un portafoglio open source e multifirma realizzato da BitPay. +Gli utenti Copay possono gestire i propri fondi individualmente, o condividerli in maniera sicura con altri utenti grazie ai portafogli multifirma, che prevengono pagamenti non autorizzati richiedendo più approvazioni. Ecco alcuni modi per utilizzare Copay con altre persone: + +Per rismarmiare soldi per le vacanze o per acquisti congiunti con gli amici +Per tenere traccia di spese familiari o indennità +Per gestire i fondi e le spese di aziende, club, or organizzazioni + +In questa versione di Copay abbiamo realizzato le seguenti funzioni per un portafoglio bitcoin che non comprometta sicurezza o accessibilità: + +Creazione e gestione integrata di portafogli multipli +Sicurezza multifirma intuitiva per portafogli personali o condivisi +Proposte di pagamento facili da iniziare per portafogli condivisi e pagamenti di gruppo +Generazione di portafogli gerarchici deterministici (HD) e funzionalità di backup +Sicurezza integrata nel dispositivo: tutte le chiave private sono memorizzate localmente, non nel cloud +Supporto per portafogli della testnet Bitcoin +Accesso sincrono in tutte le piattaforme mobile e desktop +Supporto per il protocollo di pagamento (BIP70-BIP73): richieste di pagamento facilmente identificabili e pagamenti bitcoin sicuri e verificabili +Supporto per 150+ valute e denominazione in BTC o bits +Notifiche email per pagamenti o trasferimenti +Colori di sfondo e nomi dei portafogli personalizzabli +4 lingue supportate (EN, JP, FR, ES) + +Copay è un software gratuito e open source che non dipende da server proprietari, pertanto il supporto del software non dipende da nessuna azienda. Chiunque può rivedere o contribuire al codice sorgente di Copay su GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/appstore_ko.txt b/i18n/docs/appstore_ko.txt new file mode 100644 index 000000000..c9fd43243 --- /dev/null +++ b/i18n/docs/appstore_ko.txt @@ -0,0 +1,23 @@ +비트코인을 당신이 원하는 방식으로 안전하게 보관할 수 있는 오픈소스 다중서명 지갑이 BitPay에서 출시됐습니다. +Copay는 사용자의 개인적인 자금 보관은 물론이고, 여러 명의 동의가 필요한 다중서명 지갑을 통해 누군가 독단적으로 자금을 써버리는 일을 방지하고 여럿이 함께 자금을 관리 할 수 있습니다. 예를 들면 이런 식으로 사용할 수 있습니다: + +친구들과 함께 휴가를 떠나거나 공동구매를 하기 위해 돈을 모을 때 +가족의 소비와 지출을 관리하고 싶을 때 +사업, 동호회, 단체의 자금과 소비를 관리 하고 싶을 때 + +이번 버전 Copay는 안전과 접근성에 대해 타협하지 않는 비트코인 지갑이 되기 위해 다음과 같은 기능이 포함돼 있습니다 + +앱 안에서 가능한 여러 개의 지갑 생성과 관리 +개인, 공유 지갑을 위한 직관적인 다중서명 안전장치 +공유 지갑과 공동지불을 위해 손쉽게 가능한 지불제안 +계층결정론적(Hierarchical deterministic, HD) 주소 생성과 지갑 백업 +장치기반 보안: 모든 비밀키는 클라우드가 아닌 장치 내부에 보관됩니다 +비트코인 테스트넷 지갑 지원 +모든 주요 모바일, 데스크탑 플랫폼에서의 동시 접속을 지원합니다 +Payment protocol (BIP70-BIP73)지원: 쉽게 확인 가능한 지불요청과 증명 가능한 비트코인 안전 결제 +150가지가 넘는 통화 지원과 BTC와 bits의 단위 지원 +지불, 송금의 이메일 알림 +바꿀 수 있는 지갑의 이름과 배경색 +4개국어 지원(영어, 일본어, 프랑스어, 스페인어) + +Copay는 누구나 운영할 수 있는 서버에서 돌아가는 무료 오픈소스 소프트웨어입니다. 그러므로 어떤 한 회사의 지속적인 지원에 의지할 필요가 없습니다. 누구나 GitHub(https://github.com/bitpay/copay)에서 Copay의 소스코드를 검토하거나 참여할 수 있습니다 diff --git a/i18n/docs/appstore_ru.txt b/i18n/docs/appstore_ru.txt new file mode 100644 index 000000000..87d9af542 --- /dev/null +++ b/i18n/docs/appstore_ru.txt @@ -0,0 +1,23 @@ +Обезопасьте биткойны на своих условиях с открытым исходным кодом, кошельком с мультиподписью от BitPay. +Пользователи Copay могут хранить средства самостоятельно или совместно безопасно управлять средствами вместе с другими пользователями с помощью кошельков с мультиподписью (multisignature wallets), которые предотвращают несанкционированный платежи, требуя несколько одобрений. Вот некоторые способы как Copay может быть использован вместе с другими пользователями: + +Накопить на отпуск или совместные покупки с друзьями +Отслеживать семейные траты и карманные деньги +Управлять бизнесом, клубом, или средствами и расходами организации + +Мы встроили следующие функции в эту версию Copay для биткойн-кошелька, которые не идут на компромисс безопасности или доступности: + +Создание и управление множеством кошельков внутри приложения +Интуитивно-понятная безопасность, основанная на мультиподписи, для личных и общих кошельков +Удобный порядок предложений платежей для совместных кошельков и и групповых платежей +Генерирование иерархически-детерминированных (HD) адресов и бэкакоп кошельков +Безопасность на основе устройств: все закрытые ключи хранятся локально, а не в облаке +Поддержка кошельков Bitcoin testnet +Синхронный доступ со всех основных мобильных и настольных платформ +Поддержка платежных протоколов (BIP70-BIP73): легко идентифицируемые платежные запросы и проверяемо-безопасные биткойн-платежи +Поддержка отображения сумм в более чем 150 валютах и обозначение в BTC или bits +Уведомления о платежах и переводах по email +Настраиваемые названия кошельков и цветов фона +4 поддерживаемых языка (английский, японский, французский, испанский) + +Copay бесплатен и является программным обеспечением с открытым исходным кодом, запускаемым на не-проприетарных серверах, поэтому нет необходимости полагаться на какую-либо компанию и её постоянную поддержку. Любой может просмотреть и сделать предложение по изменению исходного кода Copay на GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/appstore_tr.txt b/i18n/docs/appstore_tr.txt new file mode 100644 index 000000000..2553f6ee6 --- /dev/null +++ b/i18n/docs/appstore_tr.txt @@ -0,0 +1,23 @@ +Bitcoinlerinizi kendi kurallarınıza göre BitPay tarafından oluşturulan açık kaynak, çoklu imzalı bir cüzdan ile koruyun. +Copay kullanıcıları paralarını ayrı ayrı tutabilir veya çoklu imzalı cüzdanlar ile diğer kullanıcılarla arasında mali durumları paylaşabilirler ki birden fazla onay isteyen yetkilendirilmemiş ödemeleri önleyebilirler. Diğerleri ile kullanmak için bazı Copay yolları: + +To save for vacations or joint purchases with friends +To track family spending and allowances +To manage business, club, or organization funds and expenses + +We built the following features into this version of Copay for a bitcoin wallet that doesn't compromise on security or accessibility: + +Multiple wallet creation and management in-app +Intuitive multisignature security for personal or shared wallets +Easy spending proposal flow for shared wallets and group payments +Hierarchical deterministic (HD) address generation and wallet backups +Device-based security: all private keys are stored locally, not in the cloud +Support for Bitcoin testnet wallets +Synchronous access across all major mobile and desktop platforms +Payment protocol (BIP70-BIP73) support: easily-identifiable payment requests and verifiably secure bitcoin payments +Support for 150+ currency pricing options and unit denomination in BTC or bits +Email notifications for payments and transfers +Customizable wallet naming and background colors +4 supported languages (EN, JP, FR, ES) + +Copay is free and open source software run on non-proprietary servers, so there's no need to rely on any company for continuous support. Anyone can review or contribute to Copay's source code on GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/appstore_zh.txt b/i18n/docs/appstore_zh.txt new file mode 100644 index 000000000..848f5c720 --- /dev/null +++ b/i18n/docs/appstore_zh.txt @@ -0,0 +1,23 @@ +Secure bitcoin on your own terms with an open source, multisignature wallet from BitPay. +Copay users can hold funds individually or share finances securely with other users with multisignature wallets, which prevent unauthorized payments by requiring multiple approvals. Here are some ways Copay can be used with others: + +To save for vacations or joint purchases with friends +To track family spending and allowances +可用来管理商务，团体，或集团的收支 + +We built the following features into this version of Copay for a bitcoin wallet that doesn't compromise on security or accessibility: + +Multiple wallet creation and management in-app +Intuitive multisignature security for personal or shared wallets +Easy spending proposal flow for shared wallets and group payments +Hierarchical deterministic (HD) address generation and wallet backups +Device-based security: all private keys are stored locally, not in the cloud +Support for Bitcoin testnet wallets +Synchronous access across all major mobile and desktop platforms +Payment protocol (BIP70-BIP73) support: easily-identifiable payment requests and verifiably secure bitcoin payments +Support for 150+ currency pricing options and unit denomination in BTC or bits +Email notifications for payments and transfers +Customizable wallet naming and background colors +4种可用语言 (EN，JP，FR，ES) + +Copay is free and open source software run on non-proprietary servers, so there's no need to rely on any company for continuous support. Anyone can review or contribute to Copay's source code on GitHub (https://github.com/bitpay/copay). diff --git a/i18n/docs/updateinfo_de.txt b/i18n/docs/updateinfo_de.txt new file mode 100644 index 000000000..b837f53bd --- /dev/null +++ b/i18n/docs/updateinfo_de.txt @@ -0,0 +1,5 @@ +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Added advanced sending options +* Added Italian, Russian, and Greek language options +* Kleinere Bug-Fixes diff --git a/i18n/docs/updateinfo_it.txt b/i18n/docs/updateinfo_it.txt new file mode 100644 index 000000000..5f40e600d --- /dev/null +++ b/i18n/docs/updateinfo_it.txt @@ -0,0 +1,5 @@ +* Livello della commissione basata sul carico del network bitcoin +* Opzione per impedire la creazione di transazioni con input non confermati +* Aggiunte le opzioni avanzate di invio +* Aggiunto il supporto alla lingua italiana, russa e greca +* Correzione bug minori diff --git a/i18n/docs/updateinfo_nl.txt b/i18n/docs/updateinfo_nl.txt new file mode 100644 index 000000000..d0bd09c97 --- /dev/null +++ b/i18n/docs/updateinfo_nl.txt @@ -0,0 +1,5 @@ +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Added advanced sending options +* Added Italian, Russian, and Greek language options +* Kleine bug fixes diff --git a/i18n/docs/updateinfo_ru.txt b/i18n/docs/updateinfo_ru.txt new file mode 100644 index 000000000..b1ee96416 --- /dev/null +++ b/i18n/docs/updateinfo_ru.txt @@ -0,0 +1,5 @@ +* Адаптивные уровни комиссий на основе загрузки сети Bitcoin +* Опция, запрещающая создание транзакций с неподтверждёнными входами +* Добавлены расширенные настройки отправки +* Добавлены итальянский, русский и греческий языки +* Исправлены мелкие ошибки diff --git a/i18n/docs/updateinfo_tr.txt b/i18n/docs/updateinfo_tr.txt index ed9f8aa09..77bb46d5d 100644 --- a/i18n/docs/updateinfo_tr.txt +++ b/i18n/docs/updateinfo_tr.txt @@ -1,5 +1,5 @@ -* Adaptive fee levels based on bitcoin network load -* Option to prevent creating transactions with unconfirmed inputs -* Added advanced sending options -* Added Italian, Russian, and Greek language options -*Küçük hata düzeltmeleri +* Bitcoin ağ yüküne göre daha uygun ücret düzeyleri +* Onaylanmamış girişler ile işlem oluşturmayı önlemek için tercih +* Gelişmiş gönderme seçenekleri eklendi +* İtalyanca, Rusça ve Yunanca dil seçenekleri eklendi +* Ufak hata düzeltmeleri diff --git a/i18n/docs/updateinfo_zh.txt b/i18n/docs/updateinfo_zh.txt new file mode 100644 index 000000000..b1291c0a5 --- /dev/null +++ b/i18n/docs/updateinfo_zh.txt @@ -0,0 +1,5 @@ +* Adaptive fee levels based on bitcoin network load +* Option to prevent creating transactions with unconfirmed inputs +* Added advanced sending options +* Added Italian, Russian, and Greek language options +*修复一些bug diff --git a/i18n/po/ja.po b/i18n/po/ja.po index 5ac9f8778..c319bf3ed 100644 --- a/i18n/po/ja.po +++ b/i18n/po/ja.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Japanese\n" "Language: ja\n" -"PO-Revision-Date: 2015-08-14 02:34-0400\n" +"PO-Revision-Date: 2015-08-15 11:27-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" diff --git a/i18n/po/ko.po b/i18n/po/ko.po new file mode 100644 index 000000000..c2639d8dc --- /dev/null +++ b/i18n/po/ko.po @@ -0,0 +1,1414 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: copay\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: ko\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83\n" +"Language-Team: Korean\n" +"Language: ko\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(이중 사용 가능성 있음)" + +#: public/views/modals/txp-details.html +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr "* 지불제안은 다음 조건이 만족할 때 지울 수 있습니다. 1) 당신이 작성자이고, 다른 지갑 참여자가 사인하지 않았을 때, 또는 2) 제안이 작성된 지 24시간 이상이 지났을 때." + +#: public/views/backup.html +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* 다른 장치에 안전하게 백업을 설치하고 여러 기기에서 동시에 지갑을 사용할 수 있습니다." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "비밀키가 없는 백업은 잔액 확인, 거래 확인, 지불 제안을 작성할 수 있지만, 제안에 찬성(서명)할 수는 없습니다." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "다중서명 비트코인 지갑" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "Copay에 대하여" + +#: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Accept" +msgstr "승인" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "지갑 추가" + +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +msgid "Address" +msgstr "주소" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "고급" + +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Advanced Send" + +#: public/views/disclaimer.html +msgid "Agree" +msgstr "동의" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "{{index.walletName}}의 별명" + +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "이미 지갑을 가지고 있나요?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "표시 통화" + +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/customized-amount.html +msgid "Amount" +msgstr "금액" + +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Amount below dust threshold" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Amount in" +msgstr "Amount in" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "변경 사항 적용 중" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "정말로 지갑을 삭제하시겠습니까?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "사용 가능한 잔액" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Average confirmation time: {{fee.nbBlocks * 10}} minutes" + +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32 마스터확장비밀키" + +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "뒤로" + +#: public/views/preferences.html +msgid "Backup" +msgstr "백업" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "백업 생성됨" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "지금 백업" + +#: public/views/backup.html +msgid "Backup options" +msgstr "백업 옵션" + +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Bad wallet invitation" + +#: public/views/walletHome.html +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "비트코인을 받기 전에 지갑의 키를 백업하길 강력히 권장합니다." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "비트코인 네트워크 수수료 설정" + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "비트코인 URI가 유효하지 않습니다!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "비트코인 주소" + +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Broadcast Payment" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "결제 전송 중" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Broadcasting transaction" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "지원되지 않는 브라우저" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "But not broadcasted. Try to send manually" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "취소" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Cancel" +msgstr "취소" + +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Cannot join the same wallet more that once" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Certified by" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "Changing wallet alias only affects the local wallet name." + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "컴퓨터에서 백업 파일을 골라주세요" + +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "돈을 보낼 지갑을 선택해주세요" + +#: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Close" +msgstr "닫기" + +#: public/views/preferences.html +msgid "Color" +msgstr "색상" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "커밋 해시" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Confirm" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "승인횟수" + +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer already in this wallet" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer already registered" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Copayer already voted on this spend proposal" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Copayer data mismatch" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Copayers" + +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copied to clipboard" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "백업을 안전한 장소에 복사해주세요" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "이 텍스트를 있는 그대로 복사해두세요(메모장이나 이메일등으로)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "클립보드에 복사" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment" +msgstr "Could not accept payment" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Could not access Wallet Service: Not found" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment" +msgstr "Could not broadcast payment" + +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Could not create address" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Could not create payment proposal" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Could not create using the specified extended private key" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Could not decrypt file, check your password" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal" +msgstr "Could not delete payment proposal" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Could not fetch payment information" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "거래내역을 가져올 수 없습니다" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "가져올 수 없습니다. 파일과 패스워드를 확인해 주세요" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "Could not join using the specified extended private key" + +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Could not join wallet" + +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "유효한 비트코인 QR코드를 인식할 수 없었습니다" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment" +msgstr "Could not reject payment" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Could not send payment" + +#: src/js/controllers/index.js +msgid "Could not update Wallet" +msgstr "지갑을 업데이트할 수 없습니다" + +#: public/views/walletHome.html +msgid "Create" +msgstr "작성" + +#: public/views/add.html +#: public/views/create.html +msgid "Create new wallet" +msgstr "새로운 지갑 만들기" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "{{requiredCopayers}}-of-{{totalCopayers}} 지갑 만들기" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "만들기, 참가하기, 불러오기" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "작성자" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "프로필 만드는 중.." + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "지갑 만드는 중..." + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Creating transaction" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "날짜" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "지불제안 삭제" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "지갑 삭제" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "이 지갑을 삭제하고 새로운 지갑 만들기" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "지갑 삭제" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Deleting payment" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "상세" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Disabled" + +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Do not include private key in backup" + +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "CSV 파일 다운로드" + +#: public/views/backup.html +msgid "Download backup" +msgstr "백업 다운로드" + +#: src/js/services/feeService.js +msgid "Economy" +msgstr "Economy" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "이메일 알림" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "비밀키 암호화" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "암호화된 백업파일이 저장됐습니다" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "패스워드를 입력해주세요" + +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error at Wallet Service" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "지갑 생성 중 오류" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "지갑 가져오는 중 오류" + +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html +msgid "Expires" +msgstr "Expires" + +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "백업 생성 실패" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "지갑 가져오기 실패" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "가족 휴가 자금" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "수수료" + +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Fee Policy" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Fetching Payment Information" + +#: public/views/translators.html +msgid "French" +msgstr "French" + +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Funds are locked by pending spend proposals" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Funds received" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "시작하기" + +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Generate QR Code" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "새로운 주소 생성" + +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr ".csv 파일 생성중..." + +#: public/views/translators.html +msgid "German" +msgstr "German" + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "'{{selectedWalletName}}' 지갑의 주소 얻는 중..." + +#: public/views/preferences.html +msgid "Global settings" +msgstr "전역 설정" + +#: public/views/disclaimer.html +msgid "Go back" +msgstr "뒤로 가기" + +#: public/views/translators.html +msgid "Greek" +msgstr "Greek" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Copay v0.9용 백업을 가지고 계신가요?" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" + +#: src/js/controllers/index.js +msgid "History" +msgstr "내역" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "홈" + +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "I affirm that I have read, understood, and agree with these terms." + +#: public/views/create.html +#: public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "If not given, a secure key will be generated" + +#: public/views/importLegacy.html +msgid "Import" +msgstr "가져오기" + +#: public/views/import.html +#: public/views/splash.html +msgid "Import backup" +msgstr "백업 가져오기" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "클라우드에서 가져올까요?" + +#: public/views/import.html +msgid "Import here" +msgstr "Import here" + +#: public/views/add.html +msgid "Import wallet" +msgstr "지갑 가져오기" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "지갑 가져오는 중..." + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "가져오는 중..." + +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Incorrect address network" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Insufficient funds" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Insufficient funds for fee" + +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Invalid" + +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Invalid address" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitation to share a Copay Wallet" + +#: public/views/translators.html +msgid "Italian" +msgstr "Italian" + +#: public/views/translators.html +msgid "Japanese" +msgstr "Japanese" + +#: public/views/create.html +#: public/views/join.html +msgid "John" +msgstr "John" + +#: public/views/join.html +msgid "Join" +msgstr "참가" + +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "공유지갑에 참가" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "지갑에 참가하는 중..." + +#: public/views/preferences.html +msgid "Language" +msgstr "언어" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "지갑 이동에 대해 더 알아보기" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effect. Please wait to create a new spend proposal" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effect. Please wait to remove this spend proposal" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Make a payment to" + +#: public/views/create.html +#: public/views/join.html +msgid "Master extended private key" +msgstr "Master extended private key" + +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Me" +msgstr "나" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "메모" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Merchant message" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "메시지" + +#: public/views/walletHome.html +msgid "More" +msgstr "More" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Moved" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "다중서명 지갑" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "나의 비트코인 주소" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "네트워크" + +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Network connection error" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "새 지불제안" + +#: public/views/walletHome.html +msgid "No Private key" +msgstr "No Private key" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "No transactions yet" + +#: src/js/services/feeService.js +msgid "Normal" +msgstr "Normal" + +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Not authorized" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Not valid" +msgstr "Not valid" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/tx-details.html +msgid "Note" +msgstr "메모" + +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "OKAY" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "참가자" + +#: public/views/import.html +#: public/views/importLegacy.html +msgid "Password" +msgstr "Password" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "Password cannot be recovered. Be sure to write it down" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "비밀번호가 필요합니다" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "비밀번호가 일치하지 않습니다" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Paste invitation here" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Paste the backup plain text code" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Pay To" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Payment Accepted" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "지불제안" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Payment Proposal Created" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Payment Proposal Rejected" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Payment Proposal Rejected by Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Payment Proposal Signed by Copayer" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "지불제안" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Payment Protocol not supported on Chrome App" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Payment Rejected" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Payment Sent" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Payment accepted..." + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Payment details" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Payment finally rejected" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Payment request" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Payment sent!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Payment to" + +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Personal Wallet" + +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Please enter the required fields" + +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Please upgrade Copay to perform this action" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Please, select your backup file" + +#: public/views/translators.html +msgid "Portuguese" +msgstr "Portuguese" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Preferences" + +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Preparing backup..." + +#: src/js/services/feeService.js +msgid "Priority" +msgstr "Priority" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "QR코드" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR스캐너" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Receive" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Received" + +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Recipients" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Reconnecting to Wallet Service..." + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Recreate" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Recreating Wallet..." + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "거절" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Rejecting payment" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Release Information" + +#: public/views/backup.html +#: public/views/includes/password.html +msgid "Repeat password" +msgstr "패스워드 다시 입력" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Request a specific amount" + +#: public/views/import.html +#: public/views/join.html +msgid "Required" +msgstr "Required" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "다시 시도 중..." + +#: public/views/translators.html +msgid "Russian" +msgstr "Russian" + +#: public/views/includes/password.html +msgid "SET" +msgstr "SET" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "백업 건너뛰기" + +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Save" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Saving preferences..." + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Scan Finished" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Scan addresses for funds" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "Scan status finished with error" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Scanning Wallet funds..." + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "블록체인에서 보기" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "백업 파일 선택" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Select a wallet" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Select required number of signatures" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Select total number of copayers" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Send" + +#: public/views/walletHome.html +msgid "Send All" +msgstr "Send All" + +#: public/views/backup.html +#: public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Send by email" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Sent" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "서버" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "세션 로그" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "백업을 위한 패스워드를 설정해주세요" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "패스워드 설정" + +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Share address" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Share invitation" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Share this invitation with your copayers" + +#: public/views/walletHome.html +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "공유 지갑" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejected by server" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Signing payment" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Signing transaction" + +#: public/views/translators.html +msgid "Spanish" +msgstr "Spanish" + +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Spend proposal is not accepted" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Spend proposal not found" + +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "성공" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Tap to retry" + +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "이용약관" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be completed. Please try again from home screen" +msgstr "The payment was created but could not be completed. Please try again from home screen" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "The payment was created but could not be signed. Please try again from home screen" + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "The payment was removed by creator" + +#: src/js/controllers/walletHome.js +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" + +#: public/views/backup.html +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." + +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "The spend proposal is not pending" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "The wallet \"{{walletName}}\" was deleted" + +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "There are no wallets to make this payment" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "There is an error in the form" + +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "This transaction has become invalid; possibly due to a double spend attempt." + +#: public/views/walletHome.html +msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." +msgstr "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "시간" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "To" +msgstr "To" + +#: public/views/includes/output.html +msgid "Total" +msgstr "Total" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Total Locked Balance" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Transaction" + +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction already broadcasted" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Translation Credits" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Translators" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Unable to send transaction proposal" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Unconfirmed" + +#: public/views/preferences.html +msgid "Unit" +msgstr "단위" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Unsent transactions" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Untrusted" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Updating Wallet..." + +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "버전" + +#: public/views/backup.html +msgid "View backup" +msgstr "백업 보기" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "경고: 백업이 필요합니다" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "WARNING: Wallet not registered" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "WELCOME TO COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "Waiting for copayers" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "대기 중..." + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "지갑 별명" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "이미 가져온 지갑:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "지갑 초대" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "지갑 초대가 유효하지 않습니다!" + +#: src/js/services/bwsError.js +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "이미 존재하는 지갑입니다" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Wallet incomplete and broken" + +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Wallet is full" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Wallet is not complete" + +#: public/views/create.html +msgid "Wallet name" +msgstr "지갑 이름" + +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Wallet not found" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet service not found" + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "경고!" + +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Warning: this transaction has unconfirmed inputs" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "잘못된 비밀번호" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Yes" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "지갑이 없습니다" + +#: public/views/backup.html +#: public/views/import.html +msgid "Your backup password" +msgstr "백업 패스워드" + +#: public/views/create.html +#: public/views/join.html +msgid "Your nickname" +msgstr "당신의 닉네임" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "당신의 비밀번호" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "프로필 패스워드" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "지갑을 정상적으로 가져왔습니다" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "지갑 알림을 위한 이메일" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "locked by pending payments" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/includes/sidebar.html +msgid "of" +msgstr "of" + +#: public/views/walletHome.html +msgid "optional" +msgstr "선택사항" + +#: public/views/preferences.html +msgid "settings" +msgstr "설정" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "너무 깁니다!" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} will be discounted for bitcoin networking fees" + +#: src/js/controllers/importLegacy.js +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} 개의 지갑을 가져왔습니다. 잔액을 조회하고 있습니다. 갱신된 잔액을 확인하려면 기다려 주세요" + diff --git a/i18n/po/nl.po b/i18n/po/nl.po new file mode 100644 index 000000000..e536677f7 --- /dev/null +++ b/i18n/po/nl.po @@ -0,0 +1,1414 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: copay\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: nl\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83\n" +"Language-Team: Dutch\n" +"Language: nl\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(mogelijk dubbel besteed)" + +#: public/views/modals/txp-details.html +msgid "* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created." +msgstr "* Een betalingsvoorstel kan worden verwijderd als 1) u de aanmaker bent, en geen andere medebetaler heeft ondertekend, of 2) 24 uur zijn verstreken sinds het voorstel werd aangemaakt." + +#: public/views/backup.html +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* U kunt veilig uw back-up op een ander apparaat installeren en gebruik maken van uw portefeuille op meerdere apparaten op hetzelfde moment." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "A multisignature bitcoin wallet" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "About Copay" + +#: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Accept" +msgstr "Accept" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "Add wallet" + +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +msgid "Address" +msgstr "Address" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "Advanced" + +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Advanced Send" + +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Agree" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Alias for {{index.walletName}}" + +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Already have a wallet?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "Alternative Currency" + +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/customized-amount.html +msgid "Amount" +msgstr "Amount" + +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Amount below dust threshold" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Amount in" +msgstr "Amount in" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "Applying changes" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "Are you sure you want to delete this wallet?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "Available Balance" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Average confirmation time: {{fee.nbBlocks * 10}} minutes" + +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32 master extended private key" + +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "Back" + +#: public/views/preferences.html +msgid "Backup" +msgstr "Backup" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Backup created" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "Backup now" + +#: public/views/backup.html +msgid "Backup options" +msgstr "Backup options" + +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Bad wallet invitation" + +#: public/views/walletHome.html +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "Before receiving funds, it is highly recommended you backup your wallet keys." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Bitcoin Network Fee Policy" + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "Bitcoin URI is NOT valid!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "Bitcoin address" + +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Broadcast Payment" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Broadcasting Payment" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Broadcasting transaction" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "Browser unsupported" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "But not broadcasted. Try to send manually" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "CANCEL" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Cancel" +msgstr "Cancel" + +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Cannot join the same wallet more that once" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Certified by" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "Changing wallet alias only affects the local wallet name." + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "Choose a backup file from your computer" + +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Choose a wallet to send funds" + +#: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Close" +msgstr "Close" + +#: public/views/preferences.html +msgid "Color" +msgstr "Color" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Commit hash" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Confirm" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "Confirmations" + +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer already in this wallet" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer already registered" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Copayer already voted on this spend proposal" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Copayer data mismatch" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Copayers" + +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copied to clipboard" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "Copy backup to a safe place" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "Copy this text as it is to a safe place (notepad or email)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "Copy to clipboard" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment" +msgstr "Could not accept payment" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Could not access Wallet Service: Not found" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment" +msgstr "Could not broadcast payment" + +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Could not create address" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Could not create payment proposal" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Could not create using the specified extended private key" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Could not decrypt file, check your password" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal" +msgstr "Could not delete payment proposal" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Could not fetch payment information" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "Could not fetch transaction history" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "Could not import. Check input file and password" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "Could not join using the specified extended private key" + +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Could not join wallet" + +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Could not recognize a valid Bitcoin QR Code" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment" +msgstr "Could not reject payment" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Could not send payment" + +#: src/js/controllers/index.js +msgid "Could not update Wallet" +msgstr "Could not update Wallet" + +#: public/views/walletHome.html +msgid "Create" +msgstr "Create" + +#: public/views/add.html +#: public/views/create.html +msgid "Create new wallet" +msgstr "Create new wallet" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "Create, join or import" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "Created by" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Creating Profile..." + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "Creating Wallet..." + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Creating transaction" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "Date" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Delete Payment Proposal" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "Delete Wallet" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Delete it and create a new one" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Delete wallet" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Deleting payment" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Details" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Disabled" + +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Do not include private key in backup" + +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Download CSV file" + +#: public/views/backup.html +msgid "Download backup" +msgstr "Download backup" + +#: src/js/services/feeService.js +msgid "Economy" +msgstr "Economy" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Email Notifications" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "Encrypt Private Key" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Encrypted backup file saved" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "Enter your password" + +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error at Wallet Service" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "Error creating wallet" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "Error importing wallet:" + +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html +msgid "Expires" +msgstr "Expires" + +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Failed to create backup" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Failed to import wallets" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "Family vacation funds" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Fee" + +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Fee Policy" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Fetching Payment Information" + +#: public/views/translators.html +msgid "French" +msgstr "French" + +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Funds are locked by pending spend proposals" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Funds received" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "GET STARTED" + +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Generate QR Code" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "Generate new address" + +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Generating .csv file..." + +#: public/views/translators.html +msgid "German" +msgstr "German" + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Getting address for wallet {{selectedWalletName}} ..." + +#: public/views/preferences.html +msgid "Global settings" +msgstr "Global settings" + +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Go back" + +#: public/views/translators.html +msgid "Greek" +msgstr "Greek" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Have a Backup from Copay v0.9?" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" + +#: src/js/controllers/index.js +msgid "History" +msgstr "History" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Home" + +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "I affirm that I have read, understood, and agree with these terms." + +#: public/views/create.html +#: public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "If not given, a secure key will be generated" + +#: public/views/importLegacy.html +msgid "Import" +msgstr "Import" + +#: public/views/import.html +#: public/views/splash.html +msgid "Import backup" +msgstr "Import backup" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "Import from the Cloud?" + +#: public/views/import.html +msgid "Import here" +msgstr "Import here" + +#: public/views/add.html +msgid "Import wallet" +msgstr "Import wallet" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "Importing wallet..." + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "Importing..." + +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Incorrect address network" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Insufficient funds" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Insufficient funds for fee" + +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Invalid" + +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Invalid address" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitation to share a Copay Wallet" + +#: public/views/translators.html +msgid "Italian" +msgstr "Italian" + +#: public/views/translators.html +msgid "Japanese" +msgstr "Japanese" + +#: public/views/create.html +#: public/views/join.html +msgid "John" +msgstr "John" + +#: public/views/join.html +msgid "Join" +msgstr "Join" + +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "Join shared wallet" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "Joining Wallet..." + +#: public/views/preferences.html +msgid "Language" +msgstr "Language" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "Learn more about Wallet Migration" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effect. Please wait to create a new spend proposal" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effect. Please wait to remove this spend proposal" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Make a payment to" + +#: public/views/create.html +#: public/views/join.html +msgid "Master extended private key" +msgstr "Master extended private key" + +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Me" +msgstr "Me" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Memo" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Merchant message" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "Message" + +#: public/views/walletHome.html +msgid "More" +msgstr "More" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Moved" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "Multisignature wallet" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "My Bitcoin address" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "Network" + +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Network connection error" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "New Payment Proposal" + +#: public/views/walletHome.html +msgid "No Private key" +msgstr "No Private key" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "No transactions yet" + +#: src/js/services/feeService.js +msgid "Normal" +msgstr "Normal" + +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Not authorized" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Not valid" +msgstr "Not valid" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/tx-details.html +msgid "Note" +msgstr "Note" + +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "OKAY" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "Participants" + +#: public/views/import.html +#: public/views/importLegacy.html +msgid "Password" +msgstr "Password" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "Password cannot be recovered. Be sure to write it down" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "Password needed" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "Passwords do not match" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Paste invitation here" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Paste the backup plain text code" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Pay To" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Payment Accepted" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Payment Proposal" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Payment Proposal Created" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Payment Proposal Rejected" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Payment Proposal Rejected by Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Payment Proposal Signed by Copayer" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Payment Proposals" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Payment Protocol not supported on Chrome App" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Payment Rejected" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Payment Sent" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Payment accepted..." + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Payment details" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Payment finally rejected" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Payment request" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Payment sent!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Payment to" + +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Personal Wallet" + +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Please enter the required fields" + +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Please upgrade Copay to perform this action" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Please, select your backup file" + +#: public/views/translators.html +msgid "Portuguese" +msgstr "Portuguese" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Preferences" + +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Preparing backup..." + +#: src/js/services/feeService.js +msgid "Priority" +msgstr "Priority" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "QR Code" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR-Scanner" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Receive" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Received" + +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Recipients" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Reconnecting to Wallet Service..." + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Recreate" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Recreating Wallet..." + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "Reject" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Rejecting payment" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Release Information" + +#: public/views/backup.html +#: public/views/includes/password.html +msgid "Repeat password" +msgstr "Repeat password" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Request a specific amount" + +#: public/views/import.html +#: public/views/join.html +msgid "Required" +msgstr "Required" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "Retrying..." + +#: public/views/translators.html +msgid "Russian" +msgstr "Russian" + +#: public/views/includes/password.html +msgid "SET" +msgstr "SET" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "SKIP BACKUP" + +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Save" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Saving preferences..." + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Scan Finished" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Scan addresses for funds" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "Scan status finished with error" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Scanning Wallet funds..." + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "See it on the blockchain" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "Select a backup file" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Select a wallet" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Select required number of signatures" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Select total number of copayers" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Send" + +#: public/views/walletHome.html +msgid "Send All" +msgstr "Send All" + +#: public/views/backup.html +#: public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Send by email" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Sent" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "Server" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Session log" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "Set up a Password for your backup" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "Set up a password" + +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Share address" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Share invitation" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Share this invitation with your copayers" + +#: public/views/walletHome.html +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Shared Wallet" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejected by server" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Signing payment" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Signing transaction" + +#: public/views/translators.html +msgid "Spanish" +msgstr "Spanish" + +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Spend proposal is not accepted" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Spend proposal not found" + +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Success" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Tap to retry" + +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Terms of Use" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be completed. Please try again from home screen" +msgstr "The payment was created but could not be completed. Please try again from home screen" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "The payment was created but could not be signed. Please try again from home screen" + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "The payment was removed by creator" + +#: src/js/controllers/walletHome.js +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" + +#: public/views/backup.html +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." + +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "The spend proposal is not pending" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "The wallet \"{{walletName}}\" was deleted" + +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "There are no wallets to make this payment" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "There is an error in the form" + +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "This transaction has become invalid; possibly due to a double spend attempt." + +#: public/views/walletHome.html +msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." +msgstr "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "Time" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "To" +msgstr "To" + +#: public/views/includes/output.html +msgid "Total" +msgstr "Total" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Total Locked Balance" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Transaction" + +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction already broadcasted" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Translation Credits" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Translators" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Unable to send transaction proposal" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Unconfirmed" + +#: public/views/preferences.html +msgid "Unit" +msgstr "Unit" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Unsent transactions" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Untrusted" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Updating Wallet..." + +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Version" + +#: public/views/backup.html +msgid "View backup" +msgstr "View backup" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "WARNING: Backup needed" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "WARNING: Wallet not registered" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "WELCOME TO COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "Waiting for copayers" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "Waiting..." + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Wallet Alias" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "Wallet Already Imported:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "Wallet Invitation" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "Wallet Invitation is not valid!" + +#: src/js/services/bwsError.js +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "Wallet already exists" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Wallet incomplete and broken" + +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Wallet is full" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Wallet is not complete" + +#: public/views/create.html +msgid "Wallet name" +msgstr "Wallet name" + +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Wallet not found" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet service not found" + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "Warning!" + +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Warning: this transaction has unconfirmed inputs" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "Wrong password" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Yes" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "You do not have a wallet" + +#: public/views/backup.html +#: public/views/import.html +msgid "Your backup password" +msgstr "Your backup password" + +#: public/views/create.html +#: public/views/join.html +msgid "Your nickname" +msgstr "Your nickname" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "Your password" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "Your profile password" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Your wallet has been imported correctly" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "email for wallet notifications" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "locked by pending payments" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/includes/sidebar.html +msgid "of" +msgstr "of" + +#: public/views/walletHome.html +msgid "optional" +msgstr "optional" + +#: public/views/preferences.html +msgid "settings" +msgstr "settings" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "too long!" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} will be discounted for bitcoin networking fees" + +#: src/js/controllers/importLegacy.js +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" + diff --git a/i18n/po/ru.po b/i18n/po/ru.po index 5808872c5..9414e2c39 100644 --- a/i18n/po/ru.po +++ b/i18n/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Last-Translator: cmgustavo83\n" "Language-Team: Russian\n" "Language: ru\n" -"PO-Revision-Date: 2015-08-14 02:34-0400\n" +"PO-Revision-Date: 2015-08-14 22:46-0400\n" #: public/views/walletHome.html msgid "(possible double spend)" @@ -24,11 +24,11 @@ msgstr "* Предложение платежа может быть удален #: public/views/backup.html msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." -msgstr "* Вы можете безопасно восстановить свой бэкап на другом устройстве и использовать ваш кошелек с нескольких устройств одновременно." +msgstr "* Вы можете безопасно восстановить свою резервную копию на другом устройстве и использовать ваш кошелек с нескольких устройств одновременно." #: public/views/backup.html msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." -msgstr "Бэкап без закрытого ключа позволит пользователю видеть баланс кошелька, транзакции, и создавать предложения платежей. Однако будет невозможно одобрить (подписать) предложения." +msgstr "Резервная копия без закрытого ключа позволит пользователю видеть баланс кошелька, транзакции, и создавать предложения платежей. Однако будет невозможно одобрить (подписать) предложения." #: public/views/splash.html msgid "A multisignature bitcoin wallet" diff --git a/i18n/po/sq.po b/i18n/po/sq.po new file mode 100644 index 000000000..899d2fd41 --- /dev/null +++ b/i18n/po/sq.po @@ -0,0 +1,1414 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Project-Id-Version: copay\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: copay\n" +"X-Crowdin-Language: sq\n" +"X-Crowdin-File: template.pot\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Last-Translator: cmgustavo83\n" +"Language-Team: Albanian\n" +"Language: sq\n" +"PO-Revision-Date: 2015-08-13 09:15-0400\n" + +#: public/views/walletHome.html +msgid "(possible double spend)" +msgstr "(possible double spend)" + +#: public/views/modals/txp-details.html +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 "* 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." + +#: public/views/backup.html +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." +msgstr "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." + +#: public/views/backup.html +msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." +msgstr "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals." + +#: public/views/splash.html +msgid "A multisignature bitcoin wallet" +msgstr "A multisignature bitcoin wallet" + +#: public/views/preferences.html +msgid "About Copay" +msgstr "Rreth Copay" + +#: public/views/modals/txp-details.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Accept" +msgstr "Prano" + +#: public/views/includes/sidebar.html +msgid "Add wallet" +msgstr "Shto kuletë" + +#: public/views/paymentUri.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +msgid "Address" +msgstr "Adresa" + +#: public/views/preferences.html +msgid "Advanced" +msgstr "Avancuar" + +#: public/views/modals/advancedSend.html +msgid "Advanced Send" +msgstr "Dërgim i avancuar" + +#: public/views/disclaimer.html +msgid "Agree" +msgstr "Pranoj" + +#: public/views/preferencesAlias.html +msgid "Alias for {{index.walletName}}" +msgstr "Nofka për {{index.walletName}}" + +#: public/views/translators.html +msgid "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" +msgstr "All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Tashmë keni një kuletë?" + +#: public/views/preferences.html +msgid "Alternative Currency" +msgstr "Monedhë alternative" + +#: public/views/paymentUri.html +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/customized-amount.html +msgid "Amount" +msgstr "Shuma" + +#: src/js/services/bwsError.js +msgid "Amount below dust threshold" +msgstr "Amount below dust threshold" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Amount in" +msgstr "Shuma në" + +#: public/views/preferencesLanguage.html +msgid "Applying changes" +msgstr "Duke aplikuar ndryshimet" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "Are you sure you want to delete this wallet?" +msgstr "Jeni i sigurtë që doni të fshini këtë kuletë?" + +#: public/views/walletHome.html +msgid "Available Balance" +msgstr "Shuma në dispozicion" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes" +msgstr "Koha mesatare e konfirmimit: {{fee.nbBlocks * 10}} minuta" + +#: public/views/create.html +#: public/views/join.html +msgid "BIP32 master extended private key" +msgstr "BIP32 master çelësi privat i zgjëruar" + +#: public/views/includes/topbar.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Back" +msgstr "Prapa" + +#: public/views/preferences.html +msgid "Backup" +msgstr "Kopje rezervë" + +#: src/js/controllers/backup.js +msgid "Backup created" +msgstr "Kopja rezervë u krijua" + +#: public/views/walletHome.html +msgid "Backup now" +msgstr "Krijo kopjen rezervë tani" + +#: public/views/backup.html +msgid "Backup options" +msgstr "Opsionet e kopjes rezervë" + +#: src/js/services/profileService.js +msgid "Bad wallet invitation" +msgstr "Bad wallet invitation" + +#: public/views/walletHome.html +msgid "Before receiving funds, it is highly recommended you backup your wallet keys." +msgstr "Before receiving funds, it is highly recommended you backup your wallet keys." + +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Bitcoin Network Fee Policy" + +#: public/views/paymentUri.html +msgid "Bitcoin URI is NOT valid!" +msgstr "Bitcoin URI NUK është valid!" + +#: public/views/walletHome.html +msgid "Bitcoin address" +msgstr "Bitcoin adresa" + +#: public/views/preferencesFee.html +msgid "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." +msgstr "Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy." + +#: public/views/modals/txp-details.html +msgid "Broadcast Payment" +msgstr "Transmeto pagesën" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Duke transmetuar pagesën" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting transaction" +msgstr "Duke transmetuar transaksionin" + +#: public/views/unsupported.html +msgid "Browser unsupported" +msgstr "Shfletues i pambështetur" + +#: public/views/modals/txp-details.html +msgid "But not broadcasted. Try to send manually" +msgstr "Por nuk u transmetua. Provo ta dërgoni manualisht" + +#: public/views/includes/password.html +msgid "CANCEL" +msgstr "ANULO" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/modals/confirmation.html +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Cancel" +msgstr "Anulo" + +#: src/js/services/profileService.js +msgid "Cannot join the same wallet more that once" +msgstr "Cannot join the same wallet more that once" + +#: public/views/modals/paypro.html +msgid "Certified by" +msgstr "Çertifikuar nga" + +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only affects the local wallet name." +msgstr "Ndërrimi i nofkës së kuletës ndikon vetëm në emrin lokal të kuletës." + +#: public/views/import.html +msgid "Choose a backup file from your computer" +msgstr "Choose a backup file from your computer" + +#: public/views/modals/wallets.html +msgid "Choose a wallet to send funds" +msgstr "Choose a wallet to send funds" + +#: public/views/includes/topbar.html +#: public/views/modals/advancedSend.html +#: public/views/modals/copayers.html +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/scanner.html +#: public/views/modals/wallets.html +msgid "Close" +msgstr "Close" + +#: public/views/preferences.html +msgid "Color" +msgstr "Color" + +#: public/views/preferencesAbout.html +msgid "Commit hash" +msgstr "Commit hash" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +#: src/js/controllers/walletHome.js +msgid "Confirm" +msgstr "Confirm" + +#: public/views/modals/tx-details.html +msgid "Confirmations" +msgstr "Confirmations" + +#: src/js/services/bwsError.js +msgid "Copayer already in this wallet" +msgstr "Copayer already in this wallet" + +#: src/js/services/bwsError.js +msgid "Copayer already registered" +msgstr "Copayer already registered" + +#: src/js/services/bwsError.js +msgid "Copayer already voted on this spend proposal" +msgstr "Copayer already voted on this spend proposal" + +#: src/js/services/bwsError.js +msgid "Copayer data mismatch" +msgstr "Copayer data mismatch" + +#: public/views/modals/copayers.html +msgid "Copayers" +msgstr "Copayers" + +#: src/js/controllers/backup.js +#: src/js/controllers/copayers.js +#: src/js/controllers/walletHome.js +msgid "Copied to clipboard" +msgstr "Copied to clipboard" + +#: public/views/backup.html +msgid "Copy backup to a safe place" +msgstr "Copy backup to a safe place" + +#: public/views/backup.html +msgid "Copy this text as it is to a safe place (notepad or email)" +msgstr "Copy this text as it is to a safe place (notepad or email)" + +#: public/views/backup.html +msgid "Copy to clipboard" +msgstr "Copy to clipboard" + +#: src/js/controllers/walletHome.js +msgid "Could not accept payment" +msgstr "Could not accept payment" + +#: src/js/controllers/index.js +msgid "Could not access Wallet Service: Not found" +msgstr "Could not access Wallet Service: Not found" + +#: src/js/controllers/walletHome.js +msgid "Could not broadcast payment" +msgstr "Could not broadcast payment" + +#: src/js/services/addressService.js +msgid "Could not create address" +msgstr "Could not create address" + +#: src/js/controllers/walletHome.js +msgid "Could not create payment proposal" +msgstr "Could not create payment proposal" + +#: src/js/services/profileService.js +msgid "Could not create using the specified extended private key" +msgstr "Could not create using the specified extended private key" + +#: src/js/controllers/import.js +msgid "Could not decrypt file, check your password" +msgstr "Could not decrypt file, check your password" + +#: src/js/controllers/walletHome.js +msgid "Could not delete payment proposal" +msgstr "Could not delete payment proposal" + +#: src/js/controllers/walletHome.js +msgid "Could not fetch payment information" +msgstr "Could not fetch payment information" + +#: public/views/walletHome.html +msgid "Could not fetch transaction history" +msgstr "Could not fetch transaction history" + +#: src/js/services/profileService.js +msgid "Could not import. Check input file and password" +msgstr "Could not import. Check input file and password" + +#: src/js/services/profileService.js +msgid "Could not join using the specified extended private key" +msgstr "Could not join using the specified extended private key" + +#: src/js/services/profileService.js +msgid "Could not join wallet" +msgstr "Could not join wallet" + +#: src/js/controllers/walletHome.js +msgid "Could not recognize a valid Bitcoin QR Code" +msgstr "Could not recognize a valid Bitcoin QR Code" + +#: src/js/controllers/walletHome.js +msgid "Could not reject payment" +msgstr "Could not reject payment" + +#: src/js/controllers/walletHome.js +msgid "Could not send payment" +msgstr "Could not send payment" + +#: src/js/controllers/index.js +msgid "Could not update Wallet" +msgstr "Could not update Wallet" + +#: public/views/walletHome.html +msgid "Create" +msgstr "Create" + +#: public/views/add.html +#: public/views/create.html +msgid "Create new wallet" +msgstr "Create new wallet" + +#: public/views/create.html +msgid "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" +msgstr "Create {{requiredCopayers}}-of-{{totalCopayers}} wallet" + +#: public/views/includes/sidebar.html +msgid "Create, join or import" +msgstr "Create, join or import" + +#: public/views/modals/txp-details.html +msgid "Created by" +msgstr "Created by" + +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Creating Profile..." + +#: public/views/create.html +msgid "Creating Wallet..." +msgstr "Creating Wallet..." + +#: src/js/controllers/walletHome.js +msgid "Creating transaction" +msgstr "Creating transaction" + +#: public/views/preferencesFee.html +#: public/views/modals/advancedSend.html +msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" +msgstr "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB" + +#: public/views/modals/tx-details.html +msgid "Date" +msgstr "Date" + +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Delete Payment Proposal" + +#: public/views/preferencesAdvanced.html +msgid "Delete Wallet" +msgstr "Delete Wallet" + +#: public/views/copayers.html +msgid "Delete it and create a new one" +msgstr "Delete it and create a new one" + +#: public/views/preferencesDeleteWallet.html +msgid "Delete wallet" +msgstr "Delete wallet" + +#: src/js/controllers/walletHome.js +msgid "Deleting payment" +msgstr "Deleting payment" + +#: public/views/modals/customized-amount.html +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Details" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Disabled" + +#: public/views/backup.html +msgid "Do not include private key in backup" +msgstr "Do not include private key in backup" + +#: public/views/translators.html +msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." + +#: public/views/walletHome.html +msgid "Download CSV file" +msgstr "Download CSV file" + +#: public/views/backup.html +msgid "Download backup" +msgstr "Download backup" + +#: src/js/services/feeService.js +msgid "Economy" +msgstr "Economy" + +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Email Notifications" + +#: public/views/preferences.html +msgid "Encrypt Private Key" +msgstr "Encrypt Private Key" + +#: src/js/controllers/backup.js +msgid "Encrypted backup file saved" +msgstr "Encrypted backup file saved" + +#: public/views/includes/password.html +msgid "Enter your password" +msgstr "Enter your password" + +#: src/js/controllers/index.js +msgid "Error at Wallet Service" +msgstr "Error at Wallet Service" + +#: src/js/services/profileService.js +msgid "Error creating wallet" +msgstr "Error creating wallet" + +#: src/js/services/profileService.js +msgid "Error importing wallet:" +msgstr "Error importing wallet:" + +#: public/views/modals/paypro.html +#: public/views/modals/txp-details.html +msgid "Expires" +msgstr "Expires" + +#: public/views/backup.html +msgid "Failed to create backup" +msgstr "Failed to create backup" + +#: src/js/controllers/importLegacy.js +msgid "Failed to import wallets" +msgstr "Failed to import wallets" + +#: public/views/create.html +msgid "Family vacation funds" +msgstr "Family vacation funds" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Fee" + +#: public/views/modals/advancedSend.html +msgid "Fee Policy" +msgstr "Fee Policy" + +#: public/views/walletHome.html +msgid "Fee policy for this transaction" +msgstr "Fee policy for this transaction" + +#. Get information of payment if using Payment Protocol +#: src/js/controllers/walletHome.js +msgid "Fetching Payment Information" +msgstr "Fetching Payment Information" + +#: public/views/translators.html +msgid "French" +msgstr "French" + +#: src/js/services/bwsError.js +msgid "Funds are locked by pending spend proposals" +msgstr "Funds are locked by pending spend proposals" + +#: src/js/services/notificationsService.js +msgid "Funds received" +msgstr "Funds received" + +#: public/views/splash.html +msgid "GET STARTED" +msgstr "GET STARTED" + +#: public/views/modals/customized-amount.html +msgid "Generate QR Code" +msgstr "Generate QR Code" + +#: public/views/walletHome.html +msgid "Generate new address" +msgstr "Generate new address" + +#: public/views/walletHome.html +msgid "Generating .csv file..." +msgstr "Generating .csv file..." + +#: public/views/translators.html +msgid "German" +msgstr "German" + +#: public/views/modals/wallets.html +msgid "Getting address for wallet {{selectedWalletName}} ..." +msgstr "Getting address for wallet {{selectedWalletName}} ..." + +#: public/views/preferences.html +msgid "Global settings" +msgstr "Global settings" + +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Go back" + +#: public/views/translators.html +msgid "Greek" +msgstr "Greek" + +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Have a Backup from Copay v0.9?" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Hide advanced options" +msgstr "Hide advanced options" + +#: src/js/controllers/index.js +msgid "History" +msgstr "History" + +#: src/js/controllers/index.js +msgid "Home" +msgstr "Home" + +#: public/views/disclaimer.html +msgid "I affirm that I have read, understood, and agree with these terms." +msgstr "I affirm that I have read, understood, and agree with these terms." + +#: public/views/create.html +#: public/views/join.html +msgid "If not given, a secure key will be generated" +msgstr "If not given, a secure key will be generated" + +#: public/views/importLegacy.html +msgid "Import" +msgstr "Import" + +#: public/views/import.html +#: public/views/splash.html +msgid "Import backup" +msgstr "Import backup" + +#: public/views/importLegacy.html +msgid "Import from the Cloud?" +msgstr "Import from the Cloud?" + +#: public/views/import.html +msgid "Import here" +msgstr "Import here" + +#: public/views/add.html +msgid "Import wallet" +msgstr "Import wallet" + +#: public/views/import.html +msgid "Importing wallet..." +msgstr "Importing wallet..." + +#: public/views/importLegacy.html +msgid "Importing..." +msgstr "Importing..." + +#: src/js/services/bwsError.js +msgid "Incorrect address network" +msgstr "Incorrect address network" + +#: src/js/services/bwsError.js +msgid "Insufficient funds" +msgstr "Insufficient funds" + +#: src/js/services/bwsError.js +msgid "Insufficient funds for fee" +msgstr "Insufficient funds for fee" + +#: public/views/walletHome.html +msgid "Invalid" +msgstr "Invalid" + +#: src/js/services/bwsError.js +msgid "Invalid address" +msgstr "Invalid address" + +#: src/js/controllers/copayers.js +msgid "Invitation to share a Copay Wallet" +msgstr "Invitation to share a Copay Wallet" + +#: public/views/translators.html +msgid "Italian" +msgstr "Italian" + +#: public/views/translators.html +msgid "Japanese" +msgstr "Japanese" + +#: public/views/create.html +#: public/views/join.html +msgid "John" +msgstr "John" + +#: public/views/join.html +msgid "Join" +msgstr "Join" + +#: src/js/controllers/copayers.js +msgid "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" +msgstr "Join my Copay wallet. Here is the invitation code: {{secret}} You can download Copay for your phone or desktop at https://copay.io" + +#: public/views/add.html +msgid "Join shared wallet" +msgstr "Join shared wallet" + +#: public/views/join.html +msgid "Joining Wallet..." +msgstr "Joining Wallet..." + +#: public/views/preferences.html +msgid "Language" +msgstr "Language" + +#: public/views/importLegacy.html +msgid "Learn more about Wallet Migration" +msgstr "Learn more about Wallet Migration" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to create a new spend proposal" +msgstr "Locktime in effect. Please wait to create a new spend proposal" + +#: src/js/services/bwsError.js +msgid "Locktime in effect. Please wait to remove this spend proposal" +msgstr "Locktime in effect. Please wait to remove this spend proposal" + +#: public/views/paymentUri.html +msgid "Make a payment to" +msgstr "Make a payment to" + +#: public/views/create.html +#: public/views/join.html +msgid "Master extended private key" +msgstr "Master extended private key" + +#: public/views/includes/copayers.html +#: public/views/modals/copayers.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Me" +msgstr "Me" + +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Memo" + +#: public/views/modals/tx-details.html +msgid "Merchant message" +msgstr "Merchant message" + +#: public/views/paymentUri.html +msgid "Message" +msgstr "Message" + +#: public/views/walletHome.html +msgid "More" +msgstr "More" + +#: public/views/walletHome.html +msgid "Moved" +msgstr "Moved" + +#: public/views/walletHome.html +msgid "Multisignature wallet" +msgstr "Multisignature wallet" + +#: public/views/walletHome.html +msgid "My Bitcoin address" +msgstr "My Bitcoin address" + +#: public/views/paymentUri.html +msgid "Network" +msgstr "Network" + +#: src/js/services/bwsError.js +msgid "Network connection error" +msgstr "Network connection error" + +#: src/js/services/notificationsService.js +msgid "New Payment Proposal" +msgstr "New Payment Proposal" + +#: public/views/walletHome.html +msgid "No Private key" +msgstr "No Private key" + +#: public/views/walletHome.html +msgid "No transactions yet" +msgstr "No transactions yet" + +#: src/js/services/feeService.js +msgid "Normal" +msgstr "Normal" + +#: src/js/services/bwsError.js +msgid "Not authorized" +msgstr "Not authorized" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Not valid" +msgstr "Not valid" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/modals/tx-details.html +msgid "Note" +msgstr "Note" + +#: public/views/includes/alert.html +#: public/views/includes/password.html +msgid "OK" +msgstr "OK" + +#: public/views/modals/tx-status.html +msgid "OKAY" +msgstr "OKAY" + +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Participants" +msgstr "Participants" + +#: public/views/import.html +#: public/views/importLegacy.html +msgid "Password" +msgstr "Password" + +#: public/views/includes/password.html +msgid "Password cannot be recovered. Be sure to write it down" +msgstr "Password cannot be recovered. Be sure to write it down" + +#: src/js/services/profileService.js +msgid "Password needed" +msgstr "Password needed" + +#: src/js/controllers/password.js +msgid "Passwords do not match" +msgstr "Passwords do not match" + +#: public/views/join.html +msgid "Paste invitation here" +msgstr "Paste invitation here" + +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Paste the backup plain text code" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Pay To" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Payment Accepted" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Payment Proposal" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Payment Proposal Created" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Payment Proposal Rejected" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Payment Proposal Rejected by Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Payment Proposal Signed by Copayer" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Payment Proposals" + +#: src/js/controllers/walletHome.js +msgid "Payment Protocol not supported on Chrome App" +msgstr "Payment Protocol not supported on Chrome App" + +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Payment Rejected" + +#: public/views/modals/tx-status.html +#: src/js/services/notificationsService.js +msgid "Payment Sent" +msgstr "Payment Sent" + +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Payment accepted..." + +#: public/views/modals/txp-details.html +msgid "Payment details" +msgstr "Payment details" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Payment finally rejected" + +#: public/views/modals/paypro.html +msgid "Payment request" +msgstr "Payment request" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Payment sent!" + +#: public/views/walletHome.html +msgid "Payment to" +msgstr "Payment to" + +#: public/views/walletHome.html +msgid "Pending Confirmation" +msgstr "Pending Confirmation" + +#: public/views/preferencesDeleteWallet.html +msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" +msgstr "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED" + +#: public/views/create.html +msgid "Personal Wallet" +msgstr "Personal Wallet" + +#: src/js/controllers/create.js +#: src/js/controllers/join.js +msgid "Please enter the required fields" +msgstr "Please enter the required fields" + +#: src/js/services/bwsError.js +msgid "Please upgrade Copay to perform this action" +msgstr "Please upgrade Copay to perform this action" + +#: src/js/controllers/import.js +msgid "Please, select your backup file" +msgstr "Please, select your backup file" + +#: public/views/translators.html +msgid "Portuguese" +msgstr "Portuguese" + +#: public/views/walletHome.html +msgid "Preferences" +msgstr "Preferences" + +#: src/js/controllers/backup.js +msgid "Preparing backup..." +msgstr "Preparing backup..." + +#: src/js/services/feeService.js +msgid "Priority" +msgstr "Priority" + +#: public/views/modals/customized-amount.html +msgid "QR Code" +msgstr "QR Code" + +#: public/views/modals/scanner.html +msgid "QR-Scanner" +msgstr "QR-Scanner" + +#: src/js/controllers/index.js +msgid "Receive" +msgstr "Receive" + +#: public/views/walletHome.html +msgid "Received" +msgstr "Received" + +#: public/views/includes/output.html +#: public/views/includes/transaction.html +msgid "Recipients" +msgstr "Recipients" + +#: public/views/walletHome.html +msgid "Reconnecting to Wallet Service..." +msgstr "Reconnecting to Wallet Service..." + +#: public/views/walletHome.html +msgid "Recreate" +msgstr "Recreate" + +#: public/views/walletHome.html +msgid "Recreating Wallet..." +msgstr "Recreating Wallet..." + +#: public/views/modals/txp-details.html +msgid "Reject" +msgstr "Reject" + +#: src/js/controllers/walletHome.js +msgid "Rejecting payment" +msgstr "Rejecting payment" + +#: public/views/preferencesAbout.html +msgid "Release Information" +msgstr "Release Information" + +#: public/views/backup.html +#: public/views/includes/password.html +msgid "Repeat password" +msgstr "Repeat password" + +#: public/views/walletHome.html +#: public/views/modals/customized-amount.html +msgid "Request a specific amount" +msgstr "Request a specific amount" + +#: public/views/import.html +#: public/views/join.html +msgid "Required" +msgstr "Required" + +#: public/views/splash.html +msgid "Retrying..." +msgstr "Retrying..." + +#: public/views/translators.html +msgid "Russian" +msgstr "Russian" + +#: public/views/includes/password.html +msgid "SET" +msgstr "SET" + +#: public/views/walletHome.html +msgid "SKIP BACKUP" +msgstr "SKIP BACKUP" + +#: public/views/preferencesAlias.html +#: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html +msgid "Save" +msgstr "Save" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Saving preferences..." + +#: src/js/services/notificationsService.js +msgid "Scan Finished" +msgstr "Scan Finished" + +#: public/views/preferencesAdvanced.html +msgid "Scan addresses for funds" +msgstr "Scan addresses for funds" + +#: public/views/walletHome.html +msgid "Scan status finished with error" +msgstr "Scan status finished with error" + +#: public/views/walletHome.html +msgid "Scanning Wallet funds..." +msgstr "Scanning Wallet funds..." + +#: public/views/modals/tx-details.html +msgid "See it on the blockchain" +msgstr "See it on the blockchain" + +#: public/views/import.html +msgid "Select a backup file" +msgstr "Select a backup file" + +#: public/views/paymentUri.html +msgid "Select a wallet" +msgstr "Select a wallet" + +#: public/views/create.html +msgid "Select required number of signatures" +msgstr "Select required number of signatures" + +#: public/views/create.html +msgid "Select total number of copayers" +msgstr "Select total number of copayers" + +#: public/views/walletHome.html +#: public/views/includes/transaction.html +#: src/js/controllers/index.js +msgid "Send" +msgstr "Send" + +#: public/views/walletHome.html +msgid "Send All" +msgstr "Send All" + +#: public/views/backup.html +#: public/views/preferencesLogs.html +msgid "Send by email" +msgstr "Send by email" + +#: public/views/walletHome.html +msgid "Sent" +msgstr "Sent" + +#: public/views/importLegacy.html +msgid "Server" +msgstr "Server" + +#: public/views/preferencesAbout.html +msgid "Session log" +msgstr "Session log" + +#: public/views/backup.html +msgid "Set up a Password for your backup" +msgstr "Set up a Password for your backup" + +#: public/views/includes/password.html +msgid "Set up a password" +msgstr "Set up a password" + +#: public/views/preferencesEmail.html +msgid "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." +msgstr "Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more." + +#: public/views/walletHome.html +msgid "Share address" +msgstr "Share address" + +#: public/views/copayers.html +msgid "Share invitation" +msgstr "Share invitation" + +#: public/views/copayers.html +msgid "Share this invitation with your copayers" +msgstr "Share this invitation with your copayers" + +#: public/views/walletHome.html +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." + +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Shared Wallet" + +#: public/views/backup.html +#: public/views/create.html +#: public/views/join.html +#: public/views/walletHome.html +msgid "Show advanced options" +msgstr "Show advanced options" + +#: src/js/services/bwsError.js +msgid "Signatures rejected by server" +msgstr "Signatures rejected by server" + +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Signing payment" + +#: src/js/controllers/walletHome.js +msgid "Signing transaction" +msgstr "Signing transaction" + +#: public/views/translators.html +msgid "Spanish" +msgstr "Spanish" + +#: src/js/services/bwsError.js +msgid "Spend proposal is not accepted" +msgstr "Spend proposal is not accepted" + +#: src/js/services/bwsError.js +msgid "Spend proposal not found" +msgstr "Spend proposal not found" + +#: src/js/controllers/copayers.js +#: src/js/controllers/import.js +#: src/js/controllers/preferencesDelete.js +msgid "Success" +msgstr "Success" + +#: public/views/walletHome.html +msgid "Tap to retry" +msgstr "Tap to retry" + +#: public/views/disclaimer.html +#: public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Terms of Use" + +#: public/views/create.html +msgid "Testnet" +msgstr "Testnet" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be completed. Please try again from home screen" +msgstr "The payment was created but could not be completed. Please try again from home screen" + +#: src/js/controllers/walletHome.js +msgid "The payment was created but could not be signed. Please try again from home screen" +msgstr "The payment was created but could not be signed. Please try again from home screen" + +#: public/views/modals/txp-details.html +msgid "The payment was removed by creator" +msgstr "The payment was removed by creator" + +#: src/js/controllers/walletHome.js +msgid "The payment was signed but could not be broadcasted. Please try again from home screen" +msgstr "The payment was signed but could not be broadcasted. Please try again from home screen" + +#: public/views/backup.html +msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." +msgstr "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive." + +#: public/views/disclaimer.html +msgid "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." +msgstr "The software you are about to use functions as a free, open source, and multi-signature digital wallet. The software does not constitute an account where BitPay or other third parties serve as financial intermediaries or custodians of your bitcoin. While the software has undergone beta testing and continues to be improved by feedback from the open-source user and developer community, we cannot guarantee that there will be no bugs in the software. You acknowledge that your use of this software is at your own discretion and in compliance with all applicable laws. You are responsible for safekeeping your passwords, private key pairs, PINs and any other codes you use to access the software. IF YOU LOSE ACCESS TO YOUR COPAY WALLET OR YOUR ENCRYPTED PRIVATE KEYS AND YOU HAVE NOT SEPARATELY STORED A BACKUP OF YOUR WALLET AND CORRESPONDING PASSWORD, YOU ACKNOWLEDGE AND AGREE THAT ANY BITCOIN YOU HAVE ASSOCIATED WITH THAT COPAY WALLET WILL BECOME INACCESSIBLE. All transaction requests are irreversible. The authors of the software, employees and affiliates of Bitpay, copyright holders, and BitPay, Inc. cannot retrieve your private keys or passwords if you lose or forget them and cannot guarantee transaction confirmation as they do not have control over the Bitcoin network. To the fullest extent permitted by law, this software is provided “as is” and no representations or warranties can be made of any kind, express or implied, including but not limited to the warranties of merchantability, fitness or a particular purpose and noninfringement. You assume any and all risks associated with the use of the software. In no event shall the authors of the software, employees and affiliates of Bitpay, copyright holders, or BitPay, Inc. be held liable for any claim, damages or other liability, whether in an action of contract, tort, or otherwise, arising from, out of or in connection with the software. We reserve the right to modify this disclaimer from time to time." + +#: src/js/services/bwsError.js +msgid "The spend proposal is not pending" +msgstr "The spend proposal is not pending" + +#: src/js/controllers/copayers.js +#: src/js/controllers/preferencesDelete.js +msgid "The wallet \"{{walletName}}\" was deleted" +msgstr "The wallet \"{{walletName}}\" was deleted" + +#: public/views/paymentUri.html +msgid "There are no wallets to make this payment" +msgstr "There are no wallets to make this payment" + +#: src/js/controllers/import.js +msgid "There is an error in the form" +msgstr "There is an error in the form" + +#: public/views/modals/tx-details.html +msgid "This transaction has become invalid; possibly due to a double spend attempt." +msgstr "This transaction has become invalid; possibly due to a double spend attempt." + +#: public/views/walletHome.html +msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." +msgstr "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." + +#: public/views/modals/txp-details.html +msgid "Time" +msgstr "Time" + +#: public/views/walletHome.html +#: public/views/includes/output.html +#: public/views/includes/transaction.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "To" +msgstr "To" + +#: public/views/includes/output.html +msgid "Total" +msgstr "Total" + +#: public/views/walletHome.html +msgid "Total Locked Balance" +msgstr "Total Locked Balance" + +#: public/views/modals/tx-details.html +msgid "Transaction" +msgstr "Transaction" + +#: src/js/services/bwsError.js +msgid "Transaction already broadcasted" +msgstr "Transaction already broadcasted" + +#: public/views/translators.html +msgid "Translation Credits" +msgstr "Translation Credits" + +#: public/views/preferencesAbout.html +msgid "Translators" +msgstr "Translators" + +#: src/js/controllers/walletHome.js +msgid "Unable to send transaction proposal" +msgstr "Unable to send transaction proposal" + +#: public/views/walletHome.html +#: public/views/modals/tx-details.html +msgid "Unconfirmed" +msgstr "Unconfirmed" + +#: public/views/preferences.html +msgid "Unit" +msgstr "Unit" + +#: public/views/walletHome.html +msgid "Unsent transactions" +msgstr "Unsent transactions" + +#: public/views/modals/paypro.html +msgid "Untrusted" +msgstr "Untrusted" + +#: public/views/walletHome.html +msgid "Updating Wallet..." +msgstr "Updating Wallet..." + +#: public/views/preferences.html +#: public/views/walletHome.html +msgid "Use Unconfirmed Funds" +msgstr "Use Unconfirmed Funds" + +#: public/views/preferencesAbout.html +msgid "Version" +msgstr "Version" + +#: public/views/backup.html +msgid "View backup" +msgstr "View backup" + +#: public/views/walletHome.html +msgid "WARNING: Backup needed" +msgstr "WARNING: Backup needed" + +#: public/views/walletHome.html +msgid "WARNING: Wallet not registered" +msgstr "WARNING: Wallet not registered" + +#: public/views/splash.html +msgid "WELCOME TO COPAY" +msgstr "WELCOME TO COPAY" + +#: public/views/copayers.html +msgid "Waiting for copayers" +msgstr "Waiting for copayers" + +#: public/views/copayers.html +msgid "Waiting..." +msgstr "Waiting..." + +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Wallet Alias" + +#: src/js/services/profileService.js +msgid "Wallet Already Imported:" +msgstr "Wallet Already Imported:" + +#: public/views/join.html +msgid "Wallet Invitation" +msgstr "Wallet Invitation" + +#: public/views/join.html +msgid "Wallet Invitation is not valid!" +msgstr "Wallet Invitation is not valid!" + +#: src/js/services/bwsError.js +#: src/js/services/profileService.js +msgid "Wallet already exists" +msgstr "Wallet already exists" + +#: public/views/copayers.html +msgid "Wallet incomplete and broken" +msgstr "Wallet incomplete and broken" + +#: src/js/services/bwsError.js +msgid "Wallet is full" +msgstr "Wallet is full" + +#: src/js/services/bwsError.js +msgid "Wallet is not complete" +msgstr "Wallet is not complete" + +#: public/views/create.html +msgid "Wallet name" +msgstr "Wallet name" + +#: src/js/services/bwsError.js +msgid "Wallet not found" +msgstr "Wallet not found" + +#: src/js/services/bwsError.js +msgid "Wallet service not found" +msgstr "Wallet service not found" + +#: public/views/preferencesDeleteWallet.html +msgid "Warning!" +msgstr "Warning!" + +#: public/views/modals/txp-details.html +msgid "Warning: this transaction has unconfirmed inputs" +msgstr "Warning: this transaction has unconfirmed inputs" + +#: src/js/services/profileService.js +msgid "Wrong password" +msgstr "Wrong password" + +#: public/views/modals/confirmation.html +msgid "Yes" +msgstr "Yes" + +#: public/views/walletHome.html +msgid "You do not have a wallet" +msgstr "You do not have a wallet" + +#: public/views/backup.html +#: public/views/import.html +msgid "Your backup password" +msgstr "Your backup password" + +#: public/views/create.html +#: public/views/join.html +msgid "Your nickname" +msgstr "Your nickname" + +#: public/views/includes/password.html +msgid "Your password" +msgstr "Your password" + +#: public/views/importLegacy.html +msgid "Your profile password" +msgstr "Your profile password" + +#: src/js/controllers/import.js +msgid "Your wallet has been imported correctly" +msgstr "Your wallet has been imported correctly" + +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "email for wallet notifications" + +#: public/views/walletHome.html +msgid "locked by pending payments" +msgstr "locked by pending payments" + +#: public/views/copayers.html +#: public/views/walletHome.html +#: public/views/includes/sidebar.html +msgid "of" +msgstr "of" + +#: public/views/walletHome.html +msgid "optional" +msgstr "optional" + +#: public/views/preferences.html +msgid "settings" +msgstr "settings" + +#: public/views/walletHome.html +msgid "too long!" +msgstr "too long!" + +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "{{fee}} will be discounted for bitcoin networking fees" + +#: src/js/controllers/importLegacy.js +msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" +msgstr "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" + From 6523d1d59d9fe6732de4f74b0e0cdb384f14394c Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sun, 16 Aug 2015 13:18:15 +0900 Subject: [PATCH 135/158] Normalize line break discrepancies between OSes --- i18n/crowdin_update.js | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/i18n/crowdin_update.js b/i18n/crowdin_update.js index a83269da2..0a39b6db7 100644 --- a/i18n/crowdin_update.js +++ b/i18n/crowdin_update.js @@ -10,12 +10,32 @@ var bhttp = require('bhttp'); var crowdin_identifier = 'copay' var local_file_name1 = path.join(__dirname, 'po/template.pot') + +// Similar to Github, normalize all line breaks to CRLF so that different people +// using different OSes to update does not constantly swith format back and forth. +var local_file1_text = fs.readFileSync(local_file_name1, 'utf8'); +local_file1_text = local_file1_text.replace('\r\n', '\n'); +local_file1_text = local_file1_text.replace('\n', '\r\n'); +fs.writeFileSync(local_file_name1, local_file1_text); + var local_file1 = fs.createReadStream(local_file_name1) var local_file_name2 = path.join(__dirname, 'docs/appstore_en.txt') + +var local_file2_text = fs.readFileSync(local_file_name2, 'utf8'); +local_file2_text = local_file2_text.replace('\r\n', '\n'); +local_file2_text = local_file2_text.replace('\n', '\r\n'); +fs.writeFileSync(local_file_name2, local_file2_text); + var local_file2 = fs.createReadStream(local_file_name2) var local_file_name3 = path.join(__dirname, 'docs/updateinfo_en.txt') + +var local_file3_text = fs.readFileSync(local_file_name3, 'utf8'); +local_file3_text = local_file3_text.replace('\r\n', '\n'); +local_file3_text = local_file3_text.replace('\n', '\r\n'); +fs.writeFileSync(local_file_name3, local_file3_text); + var local_file3 = fs.createReadStream(local_file_name3) // obtain the crowdin api key @@ -31,11 +51,14 @@ if (crowdin_api_key != '') { }; bhttp.post('https://api.crowdin.com/api/project/' + crowdin_identifier + '/update-file?key=' + crowdin_api_key, payload, {}, function(err, response) { - console.log('Response from update file call:', response.body.toString()); + console.log('\nResponse from update file call:\n', response.body.toString()); // This call will tell the server to generate a new zip file for you based on most recent translations. https.get('https://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key, function(res) { console.log('Export Got response: ' + res.statusCode); + res.on('data', function(chunk) { + console.log(chunk.toString('utf8')); + }); }).on('error', function(e) { console.log('Export Got error: ' + e.message); }); From 0f1717187be57695060e6a4166a1b18040cbc931 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Mon, 17 Aug 2015 09:04:28 +0900 Subject: [PATCH 136/158] Make update file replace all instances of LF --- i18n/crowdin_update.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/i18n/crowdin_update.js b/i18n/crowdin_update.js index 0a39b6db7..8f351f3c8 100644 --- a/i18n/crowdin_update.js +++ b/i18n/crowdin_update.js @@ -14,8 +14,8 @@ var local_file_name1 = path.join(__dirname, 'po/template.pot') // Similar to Github, normalize all line breaks to CRLF so that different people // using different OSes to update does not constantly swith format back and forth. var local_file1_text = fs.readFileSync(local_file_name1, 'utf8'); -local_file1_text = local_file1_text.replace('\r\n', '\n'); -local_file1_text = local_file1_text.replace('\n', '\r\n'); +local_file1_text = local_file1_text.replace(/\r\n/g, '\n'); +local_file1_text = local_file1_text.replace(/\n/g, '\r\n'); fs.writeFileSync(local_file_name1, local_file1_text); var local_file1 = fs.createReadStream(local_file_name1) @@ -23,8 +23,8 @@ var local_file1 = fs.createReadStream(local_file_name1) var local_file_name2 = path.join(__dirname, 'docs/appstore_en.txt') var local_file2_text = fs.readFileSync(local_file_name2, 'utf8'); -local_file2_text = local_file2_text.replace('\r\n', '\n'); -local_file2_text = local_file2_text.replace('\n', '\r\n'); +local_file2_text = local_file2_text.replace(/\r\n/g, '\n'); +local_file2_text = local_file2_text.replace(/\n/g, '\r\n'); fs.writeFileSync(local_file_name2, local_file2_text); var local_file2 = fs.createReadStream(local_file_name2) @@ -32,8 +32,8 @@ var local_file2 = fs.createReadStream(local_file_name2) var local_file_name3 = path.join(__dirname, 'docs/updateinfo_en.txt') var local_file3_text = fs.readFileSync(local_file_name3, 'utf8'); -local_file3_text = local_file3_text.replace('\r\n', '\n'); -local_file3_text = local_file3_text.replace('\n', '\r\n'); +local_file3_text = local_file3_text.replace(/\r\n/g, '\n'); +local_file3_text = local_file3_text.replace(/\n/g, '\r\n'); fs.writeFileSync(local_file_name3, local_file3_text); var local_file3 = fs.createReadStream(local_file_name3) @@ -64,4 +64,3 @@ if (crowdin_api_key != '') { }); }) }; - From 9e522265b649990290fba3db3020611328b42439 Mon Sep 17 00:00:00 2001 From: Marco Polci Date: Tue, 18 Aug 2015 09:57:21 +0200 Subject: [PATCH 137/158] Fixed a broblem with latest angular-moment release (see issue 3098). --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 05df61448..2b07effab 100644 --- a/bower.json +++ b/bower.json @@ -15,8 +15,8 @@ "foundation": "zurb/bower-foundation#~5.5.1", "foundation-icon-fonts": "*", "ng-lodash": "~0.2.0", - "angular-moment": "~0.10.1", - "moment": "~2.10.3", + "angular-moment": "0.10.1", + "moment": "2.10.3", "angular-bitcore-wallet-client": "^0.1.2", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", From c209711d43a790689b9ad1def7d0bad0d400a190 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 18 Aug 2015 09:40:52 -0300 Subject: [PATCH 138/158] Removes duplicates --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index f11aa6a8e..2264f8b1c 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "grunt-cli": "^0.1.13", "grunt-contrib-concat": "^0.5.1", "grunt-contrib-copy": "^0.8.0", + "grunt-contrib-compress": "^0.13.0", "grunt-contrib-uglify": "^0.8.0", "grunt-contrib-watch": "^0.5.3", "grunt-exec": "^0.4.6", @@ -61,8 +62,6 @@ "angular": "^1.3.14", "angular-mocks": "^1.3.14", "bhttp": "^1.2.1", - "grunt-contrib-compress": "^0.13.0", - "grunt-contrib-copy": "^0.8.0", "grunt-karma": "^0.10.1", "grunt-karma-coveralls": "^2.5.3", "grunt-node-webkit-builder": "^1.0.2", From 8baed21745c6c585050cc81168e8765d9e7f2367 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 18 Aug 2015 10:21:12 -0300 Subject: [PATCH 139/158] Update README.md --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 1076f742b..1e1c08289 100644 --- a/README.md +++ b/README.md @@ -122,3 +122,22 @@ This will download all partially/completely translated languages and clean out a - German: @saschad *Gracias totales!​* + +## Release schedules +Copay uses following convention for versioning: +``` + MAJOR.MINOR.BATCH, eg: 1.1.3 +``` +Any release that adds features should modify the MINOR or MAJOR number. + +### Bug Fixing Releases + +We release it ASAP in all platforms. As soon as the bug is fixed, we release the new version to all platforms. A week later we can send a new release with translation update (like 1.1.4 and then 1.1.5). There is no coordination so all platforms are updated at the same time. + +### Minor and Major releases + - t+0: tag the release 1.2 and "text lock" (meaning, only non-text related bug fixes. Though this rule is sometimes broken, it's good to make a rule.) + - t+7: testing for 1.2 is finished, translation is also finished, and 1.2.1 is tagged with all translations and bug fixes made in the last week. + - t+7: iOS is submitted for 1.2.1. All other platforms submitted with auto-release off. + - t + (~17): All platforms 1.2.1 is released when iOS approves. + + From ae7edb1d3eafa62d1eb3fb13426f1a6e99d457fb Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 18 Aug 2015 12:31:37 -0300 Subject: [PATCH 140/158] Fix default fee: normal --- src/js/controllers/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index cb050f6da..b217a4c06 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -341,7 +341,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r }; self.setCurrentFeeLevel = function(level) { - self.currentFeeLevel = level || configService.getSync().wallet.settings.feeLevel || 'priority'; + self.currentFeeLevel = level || configService.getSync().wallet.settings.feeLevel || 'normal'; self.setSendMax(); }; @@ -791,7 +791,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r $timeout(function() { $rootScope.$apply(); }); - + }; self.recreate = function(cb) { From aefff5a831e83fa3f5c4609cf03881bd85f76676 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 18 Aug 2015 16:42:39 -0300 Subject: [PATCH 141/158] Updates translation credits: russian --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1e1c08289..c576d024a 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,7 @@ This will download all partially/completely translated languages and clean out a - Portuguese: @pmichelazzo - Spanish: @cmgustavo - German: @saschad +- Russian: @vadim0 *Gracias totales!​* From a13e12ff07c14d25558b1d3b1064368e6d1656d8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:16:55 -0300 Subject: [PATCH 142/158] Smooth start on mobile --- public/views/disclaimer.html | 8 ++++-- src/js/routes.js | 54 +++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 879d04da0..8f1426196 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -19,11 +19,13 @@

    I affirm that I have read, understood, and agree with these terms.

    -
    - +
    diff --git a/src/js/routes.js b/src/js/routes.js index 2c56b361c..1bc276d58 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -89,25 +89,27 @@ angular $scope.create = function(noWallet) { $scope.creatingProfile = true; - profileService.create({ - noWallet: noWallet - }, function(err) { - if (err) { - $scope.creatingProfile = false; - $log.warn(err); - $scope.error = err; - $scope.$apply(); - $timeout(function() { - $scope.create(noWallet); - }, 3000); - } - }); + $timeout(function() { + profileService.create({ + noWallet: noWallet + }, function(err) { + if (err) { + $scope.creatingProfile = false; + $log.warn(err); + $scope.error = err; + $scope.$apply(); + $timeout(function() { + $scope.create(noWallet); + }, 3000); + } + }); + }, 100); }; } } } }); - + $stateProvider .state('translators', { url: '/translators', @@ -125,7 +127,7 @@ angular views: { 'main': { templateUrl: 'views/disclaimer.html', - controller: function($scope, $timeout, storageService, applicationService, go) { + controller: function($scope, $timeout, storageService, applicationService, go, gettextCatalog, isCordova) { storageService.getCopayDisclaimerFlag(function(err, val) { $scope.agreed = val; $timeout(function() { @@ -134,11 +136,20 @@ angular }); $scope.agree = function() { - storageService.setCopayDisclaimerFlag(function(err) { - $timeout(function() { - applicationService.restart(); - }, 1000); - }); + if (isCordova) { + window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true); + } + $scope.loading = true; + $timeout(function() { + storageService.setCopayDisclaimerFlag(function(err) { + $timeout(function() { + if (isCordova) { + window.plugins.spinnerDialog.hide(); + } + applicationService.restart(); + }, 1000); + }); + }, 100); }; } } @@ -531,7 +542,7 @@ angular event.preventDefault(); } - /* + /* * -------------------- */ @@ -630,7 +641,6 @@ angular cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc; cachedTransitionState = desiredTransitionState; - //console.log('CACHing animation', cachedTransitionState); return false; } } From ba8e5dacc85b1ded6202a25139f24b3198392ea0 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:17:23 -0300 Subject: [PATCH 143/158] Hide some global preferences if noFocusedWallet --- public/views/preferences.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 3f1e1d0cf..bf7db5528 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -8,7 +8,7 @@
    -
      +

        {{index.alias}} [{{index.walletName}}] settings

        @@ -55,29 +55,28 @@

        Global settings

        -
      • +
      • Language {{index.defaultLanguageName|translate}}
        • - -
      • +
      • Unit {{preferences.unitName}}
        • -
      • +
      • Alternative Currency {{preferences.selectedAlternative.name}}
        • -
      • Bitcoin Network Fee Policy @@ -85,7 +84,7 @@ {{index.feeOpts[index.currentFeeLevel]|translate}}
        • -
      • +
      • Use Unconfirmed Funds
        • From cdf16f0485cec075a10b0601e234b80c845896c6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:18:16 -0300 Subject: [PATCH 144/158] Fix splash for large devices --- public/views/splash.html | 24 +++++++++++++++--------- src/css/main.css | 11 ++--------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/public/views/splash.html b/public/views/splash.html index 9fca6a0b6..5c343df9b 100644 --- a/public/views/splash.html +++ b/public/views/splash.html @@ -1,14 +1,16 @@ -
        +
        -
        -
        +
        +
        WELCOME TO COPAY

        A multisignature bitcoin wallet

        -
        - icon +
        +
        + icon +
        {{(error)|translate}}. Retrying... @@ -25,9 +27,13 @@ Creating Profile...
        -
        - -

        Already have a wallet?

        - +
        +
        + +

        Already have a wallet?

        + +
        diff --git a/src/css/main.css b/src/css/main.css index 00bc52152..ba8a7564a 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1085,20 +1085,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .splash { - width: 100%; - height: 100%; + top: 0; background: #2C3E50; - position: absolute; background-image: -webkit-linear-gradient(#3D5672 0%, #223243 100%); background-image: -o-linear-gradient(#3D5672 0%, #223243 100%); background-image: linear-gradient(#3D5672 0%, #223243 100%); } -.splash .start-button { - position: absolute; - bottom: 0; -} - .splash .start-button button.black { background-color: #4B6178; } @@ -1107,7 +1100,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { font-size: 0.58rem; } -.gif-splash { +.splash .container-image { padding: 2rem 0; } From 96f93411b324b740e801b613e4bcfd44503030e9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:35:58 -0300 Subject: [PATCH 145/158] Fix layout for prefFee, logs, about, disclaimer, translators --- public/views/disclaimer.html | 2 +- public/views/preferencesAbout.html | 2 +- public/views/preferencesFee.html | 4 ++-- public/views/preferencesLogs.html | 4 ++-- public/views/translators.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 8f1426196..f634daadd 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -23,7 +23,7 @@ Agree
        -
        diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 61e23b7bd..17ce28a14 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -6,7 +6,7 @@
        - Copay + Copay

        Release Information

        diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 7eb64566d..2cf126cd1 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -12,7 +12,7 @@
      -
      +
      @@ -22,7 +22,7 @@
      -
      +
      Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy.
      diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index dbe0d6a53..d579c9922 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -8,8 +8,8 @@
      -
      - diff --git a/public/views/translators.html b/public/views/translators.html index 39187d299..fc7def514 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -23,7 +23,7 @@
    • cmgustavo83Spanish
    • lax5Russian
    -
    +

    All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at From d29b36b93518d2ff7c143c4c4e945b7ba02aa8c8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 17:10:40 -0300 Subject: [PATCH 146/158] Clear variable if wallet changed. Fix padding in home --- src/css/mobile.css | 2 +- src/js/controllers/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index f76d106b9..113948bc2 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -168,7 +168,7 @@ _:-ms-fullscreen, :root .main { .amount { width: 100%; text-align: center; - padding: 3rem 1rem; + padding: 2.5rem 1rem 1.5rem 1rem; margin-bottom: 11px; color: #fff; height: 175px; diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index cb050f6da..5f0a5ac1c 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -95,6 +95,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.totalBalanceSat = null; self.lockedBalanceSat = null; self.availableBalanceSat = null; + self.pendingAmount = null; self.totalBalanceStr = null; self.availableBalanceStr = null; From cae4074cc9aa74e76e9e88a0764154bc1e7fc942 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 17:39:31 -0300 Subject: [PATCH 147/158] Cleaning more variables --- src/js/controllers/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 5f0a5ac1c..e8a8dbf12 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -96,6 +96,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.lockedBalanceSat = null; self.availableBalanceSat = null; self.pendingAmount = null; + self.spendUnconfirmed = null; self.totalBalanceStr = null; self.availableBalanceStr = null; @@ -104,6 +105,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.alternativeBalanceAvailable = false; self.totalBalanceAlternative = null; + self.currentFeeLevel = null; self.notAuthorized = false; self.txHistory = []; self.txHistoryPaging = false; From dc512f6459ae09c15ec38417f01fafa39a5edc41 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 17:41:10 -0300 Subject: [PATCH 148/158] Fix avatar padding --- src/css/mobile.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index 113948bc2..ad536cf03 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -198,7 +198,7 @@ _:-ms-fullscreen, :root .main { } .walletHome .avatar-wallet { - padding: 1.7rem 1rem; + padding: 0.5rem; width: 75px; height: 75px; position: absolute; @@ -209,7 +209,6 @@ _:-ms-fullscreen, :root .main { margin: 0; color: #FFF; font-weight: 700; - line-height: 15px; text-align: center; border-radius: 5px; } @@ -305,13 +304,12 @@ a.missing-copayers { font-size: 20px; font-weight: 700; margin-right: 15px; - padding: 0.33rem 0.65rem; - line-height: 24px; text-align: center; float: left; width: 35px; height: 35px; border-radius: 3px; + padding: 2px; } .sidebar header { @@ -340,7 +338,6 @@ a.missing-copayers { border-bottom: transparent; color: #A5B2BF; padding: 1rem 0.7rem; - line-height: 155%; } .sidebar ul.off-canvas-list li a i { From 854b1511de76735294d9ac4e14aa0269a11fba0c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 20 Aug 2015 16:43:03 -0300 Subject: [PATCH 149/158] Refactory single/multiples outputs --- public/views/includes/output.html | 38 +++++++----------- public/views/includes/transaction.html | 11 +++--- public/views/modals/tx-details.html | 37 +++++++++++------ public/views/modals/txp-details.html | 42 ++++++++++++++------ public/views/walletHome.html | 1 - src/js/controllers/index.js | 55 ++------------------------ src/js/controllers/walletHome.js | 18 +-------- src/js/services/utilService.js | 46 +++++++++++++++++++++ 8 files changed, 127 insertions(+), 121 deletions(-) create mode 100644 src/js/services/utilService.js diff --git a/public/views/includes/output.html b/public/views/includes/output.html index 2fb157df1..e22e4b8c2 100644 --- a/public/views/includes/output.html +++ b/public/views/includes/output.html @@ -1,24 +1,14 @@ -

    -
  • - Recipients: - {{output.recipientCount}} - - - -
    • -
  • - To: - {{output.toAddress || output.address}} -
    • -
  • - Total - Amount: - {{output.amountStr}} - {{output.alternativeAmountStr}} - -
    • -
  • - Note: - {{output.message}} -
    • -
    +
  • + To: + {{output.toAddress || output.address}} +
    • +
  • + Amount: + {{output.amountStr}} + {{output.alternativeAmountStr}} + +
    • +
  • + Note: + {{output.message}} +
    • diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index f7d9b9d92..0a0be0be0 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -11,18 +11,19 @@
    - + Recipients: - {{tx.outputs.length}} + {{tx.recipientCount}} - + To: {{tx.merchant.domain}} {{tx.merchant.domain}} - - {{tx.toAddress}} + + {{tx.toAddress}} +
    diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index d4c04665a..35e1a1e1d 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -15,7 +15,7 @@
    - +-{{btx.amountStr}} {{settings.unitName}} + +-{{btx.amountStr}}
    - @@ -25,17 +25,8 @@

    Details

      -
      -
      -
      -
      -
      -
      -
    • + +
    • To: @@ -46,7 +37,27 @@ {{btx.labelTo || btx.addressTo}} +
      • + +
    • + Recipients: + {{btx.recipientCount}} + + +
      • + +
      +
      + +
    • + Note: + {{btx.message}} +
      • +
    • This transaction has become invalid; possibly due to a double spend attempt. @@ -59,7 +70,7 @@
    • Fee: - {{feeStr}} + {{btx.feeStr}}
    • Note: diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 9a504c217..2f8866ed1 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -14,21 +14,41 @@

      Details

        -
        -
        -
        -
        -
        + To: + {{tx.toAddress}} + +
      • + Total + Amount: + {{tx.amountStr}} + {{tx.alternativeAmountStr}} + +
        • +
      • + Note: + {{tx.message}} +
        • + +
      • + Recipients: + {{tx.recipientCount}} + + + +
        • + +
        +
      • Fee: - {{feeStr}} + {{tx.feeStr}}
      • Time: diff --git a/public/views/walletHome.html b/public/views/walletHome.html index a8f78582e..5bb883278 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -505,7 +505,6 @@ {{btx.amountStr}} - {{home.getUnitName()}}
        • diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index cb050f6da..9117cc054 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError) { +angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, utilService) { var self = this; self.isCordova = isCordova; self.onGoingProcess = {}; @@ -466,49 +466,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }; - self.summarizeOutputs = function(tx, formatAmount) { - tx.showSingle = true; - if (tx.outputs) { - tx.showSingle = false; - tx.outputs.details = lodash.clone(tx.outputs); - var total = lodash.reduce(tx.outputs.details, function(total, o) { - formatAmount(o); - return total + o.amount; - }, 0); - if (tx.action != 'received') { - tx.amount = total; - } - tx.outputs.summary = { - amount: tx.amount, - message: tx.message, - isSummary: true, - showDetails: false, - recipientCount: tx.outputs.details.length - }; - formatAmount(tx.outputs.summary); - if (tx.outputs.length === 1 && !tx.outputs[0].message) { - tx.showSingle = true; - tx.toAddress = tx.outputs[0].toAddress; // txproposal - tx.address = tx.outputs[0].address; // txhistory - } - } - }; - self.setPendingTxps = function(txps) { - var config = configService.getSync().wallet.settings; self.pendingTxProposalsCountForUs = 0; lodash.each(txps, function(tx) { - function formatAmount(tx) { - tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; - tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; - tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; - }; - - self.summarizeOutputs(tx, formatAmount); - formatAmount(tx); - - tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName; - tx.alternativeIsoCode = config.alternativeIsoCode; + + tx = utilService.processTx(tx); var action = lodash.find(tx.actions, { copayerId: self.copayerId @@ -543,21 +505,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r var c = 0; self.txHistoryPaging = txs[self.limitHistory] ? true : false; lodash.each(txs, function(tx) { + tx = utilService.processTx(tx); // no future transactions... if (tx.time > now) tx.time = now; - tx.rateTs = Math.floor((tx.ts || now) / 1000); - if (tx.fees) - tx.feeStr = profileService.formatAmount(tx.fees) + ' ' + config.unitName; - - function formatAmount(tx) { - tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')( - }; - - self.summarizeOutputs(tx, formatAmount); - formatAmount(tx); if (c < self.limitHistory) { self.txHistory.push(tx); c++; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 1f633431c..54cd7f6e0 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, feeService, bwsError) { +angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, feeService, bwsError, utilService) { var self = this; $rootScope.hideMenuBar = false; @@ -171,9 +171,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.error = null; $scope.tx = tx; - $scope.amountStr = tx.amountStr; - $scope.feeStr = tx.feeStr; - $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers $scope.copayerId = fc.credentials.copayerId; $scope.canSign = fc.canSign(); @@ -204,10 +201,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var action = lodash.find(tx.actions, { copayerId: fc.credentials.copayerId }); - tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; - tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; - tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; - $scope.tx = tx; + $scope.tx = utilService.processTx(tx); if (!action && tx.status == 'pending') $scope.tx.pendingForUs = true; $scope.updateCopayerList(); @@ -351,10 +345,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.copyAddress(addr); }; - $scope.toggleOutputDetails = function(summary) { - summary.showDetails = !summary.showDetails; - }; - $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; @@ -1017,7 +1007,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.color = fc.backgroundColor; $scope.copayerId = fc.credentials.copayerId; $scope.isShared = fc.credentials.n > 1; - $scope.feeStr = btx.feeStr; $scope.getAmount = function(amount) { return self.getAmount(amount); @@ -1041,9 +1030,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $modalInstance.dismiss('cancel'); }; - $scope.toggleOutputDetails = function(summary) { - summary.showDetails = !summary.showDetails; - }; }; var modalInstance = $modal.open({ diff --git a/src/js/services/utilService.js b/src/js/services/utilService.js new file mode 100644 index 000000000..08b4787c3 --- /dev/null +++ b/src/js/services/utilService.js @@ -0,0 +1,46 @@ +'use strict'; + +angular.module('copayApp.services').factory('utilService', function(profileService, rateService, configService, lodash) { + var root = {}; + + var formatAmountStr = function(amount) { + if (!amount) return; + var config = configService.getSync().wallet.settings; + return profileService.formatAmount(amount) + ' ' + config.unitName; + }; + + var formatAlternativeStr = function(amount) { + if (!amount) return; + var config = configService.getSync().wallet.settings; + return (rateService.toFiat(amount, config.alternativeIsoCode) ? rateService.toFiat(amount, config.alternativeIsoCode).toFixed(2) : 'N/A') + ' ' + config.alternativeIsoCode; + }; + + var formatFeeStr = function(fee) { + if (!fee) return; + var config = configService.getSync().wallet.settings; + return profileService.formatAmount(fee) + ' ' + config.unitName; + }; + + root.processTx = function(tx) { + if (!tx) return; + + var outputs = tx.outputs ? tx.outputs.length : 0; + if (outputs > 1 && tx.action != 'received') { + tx.hasMultiplesOutputs = true; + tx.recipientCount = outputs; + tx.amount = lodash.reduce(tx.outputs, function(total, o) { + o.amountStr = formatAmountStr(o.amount); + o.alternativeAmountStr = formatAlternativeStr(o.amount); + return total + o.amount; + }, 0); + } + + tx.amountStr = formatAmountStr(tx.amount); + tx.alternativeAmountStr = formatAlternativeStr(tx.amount); + tx.feeStr = formatFeeStr(tx.fee || tx.fees); + + return tx; + }; + + return root; +}); From 7459c0e44fbe170bf94c00c3bdee7a07bf4bccc6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 20 Aug 2015 18:10:46 -0300 Subject: [PATCH 150/158] Fix multiples outputs in history --- public/views/modals/tx-details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 35e1a1e1d..c26f2fa53 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -49,7 +49,7 @@
        From 43e99c6b7ad6020e83a0b75ec11c217347051671 Mon Sep 17 00:00:00 2001 From: Kosta Korenkov <7r0ggy@gmail.com> Date: Fri, 21 Aug 2015 08:01:34 +0300 Subject: [PATCH 151/158] Add logo directive .. so that logo can be overriden in addon. --- public/views/disclaimer.html | 2 +- public/views/includes/sidebar.html | 2 +- public/views/preferencesAbout.html | 2 +- public/views/unsupported.html | 2 +- src/css/main.css | 11 ----------- src/js/directives/directives.js | 14 ++++++++++++++ 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index f634daadd..6af69b433 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -10,7 +10,7 @@

        Terms of Use - Copay +

        diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index e1742550c..3790ee0dd 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -1,6 +1,6 @@