From d851f62c7f4929b82156a39e4cecaf7aff6a7657 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 14 May 2015 10:39:22 -0300 Subject: [PATCH 001/250] add wallet alias --- public/views/includes/topbar.html | 2 +- public/views/preferences.html | 11 ++++++++- public/views/preferencesAlias.html | 18 ++++++++++++++ src/js/controllers/backup.js | 4 +++- src/js/controllers/index.js | 17 +++++++++++++ src/js/controllers/paymentUri.js | 5 ++-- src/js/controllers/preferencesAlias.js | 32 +++++++++++++++++++++++++ src/js/controllers/preferencesDelete.js | 5 ++-- src/js/controllers/sidebar.js | 10 ++++++-- src/js/routes.js | 14 +++++++++++ src/js/services/backupService.js | 2 +- src/js/services/notificationsService.js | 15 ++++++------ 12 files changed, 118 insertions(+), 17 deletions(-) create mode 100644 public/views/preferencesAlias.html create mode 100644 src/js/controllers/preferencesAlias.js diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index 4be35bfbc..ed8a93980 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -21,7 +21,7 @@

- {{(titleSection|translate) || index.walletName}} + {{(titleSection|translate) || (index.alias || index.walletName)}}

diff --git a/public/views/preferences.html b/public/views/preferences.html index d40d26613..73f4ce9de 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -9,7 +9,16 @@
-
-
+
+

Bitcoin URI is NOT valid!

-
+

Make a payment to

-
Address: {{uri.address.toString()}}
-
Amount: {{uri.amount}}
-
Message: {{uri.message}}
-
Network: {{uri.network}}
+
Address: {{payment.uri.address.toString()}}
+
Amount: {{payment.uri.amount}}
+
Message: {{payment.uri.message}}
+
Network: {{payment.uri.network}}

Select a wallet

-
- @@ -57,12 +57,12 @@

Have a Backup from Copay v0.9?

- -
+
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html index c4410aa78..cc0476816 100644 --- a/public/views/importLegacy.html +++ b/public/views/importLegacy.html @@ -1,5 +1,5 @@ -
@@ -12,7 +12,7 @@

Importing...

    -
  • +
  • {{m.message|translate}}
@@ -49,10 +49,10 @@ name="server" ng-model="importLegacy.server" required> - @@ -65,15 +65,14 @@
- +
- +
- diff --git a/public/views/join.html b/public/views/join.html index a472af711..9fd8e2b62 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,5 +1,5 @@ -
@@ -83,7 +83,7 @@ - + diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 1d5d40366..78ef455eb 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -82,7 +82,7 @@
- diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 774e8834c..fe0590f39 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -1,7 +1,7 @@
- OKAY + OKAY
diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index 17387d40c..6b7af95d0 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -1,5 +1,5 @@ -
@@ -10,7 +10,7 @@
-

Changing wallet alias only afects the local wallet name. diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index acef1d2bc..68504ecbe 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -1,5 +1,5 @@ -

@@ -10,7 +10,7 @@
-
diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 425909eee..e9e5b6009 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -1,5 +1,5 @@ -
@@ -14,7 +14,7 @@

Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED

-
diff --git a/src/css/main.css b/src/css/main.css index 438846175..de1227b61 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -696,7 +696,6 @@ button.black, .button.black { background-color: #2C3E50; color: #fff; - border: 1px solid transparent; } /* GRAY */ @@ -706,6 +705,10 @@ button.gray, color: #2C3E50; } +button.disabled, button[disabled], .button.disabled, .button[disabled] { + border-color: transparent; +} + button.disabled.black, button[disabled].black, .button.disabled.black, diff --git a/src/js/services/notificationsService.js b/src/js/services/notificationsService.js index ea26be0f4..9b698c8ab 100644 --- a/src/js/services/notificationsService.js +++ b/src/js/services/notificationsService.js @@ -52,7 +52,7 @@ angular.module('copayApp.services') var config = configService.getSync(); config.colorFor = config.colorFor || {}; - var color = config.colorFor[walletId] || '#2C3E50'; + var color = config.colorFor[walletId] || '#7A8C9E'; var name = config.aliasFor[walletId] || walletName; switch (notificationData.type) { From ff0452444422760f38043fb54bebc22597742863 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 18 May 2015 12:43:15 -0300 Subject: [PATCH 015/250] fix setTab after some animations --- src/js/routes.js | 5 ++--- src/js/services/go.js | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index 6c0c21f04..b407bc0e4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -462,7 +462,6 @@ angular e2.addEventListener("animationend", cleanUp, true); e.addEventListener("webkitAnimationEnd", cleanUp, true); e2.addEventListener("webkitAnimationEnd", cleanUp, true); - // TODO timeoutID = setTimeout(cleanUp, 500); }; @@ -520,7 +519,7 @@ angular e.className = entering || ''; cachedBackPanel.className = leaving || ''; cleanUpLater(e, cachedBackPanel); - console.log('USing', cachedTransitionState); //TODO + //console.log('USing animation', cachedTransitionState); return true; } else { var sc; @@ -538,7 +537,7 @@ angular cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc; cachedTransitionState = desiredTransitionState; - console.log('CACHing', cachedTransitionState); //TODO + //console.log('CACHing animation', cachedTransitionState); return false; } } diff --git a/src/js/services/go.js b/src/js/services/go.js index e3b75dc54..d9fd0a4b3 100644 --- a/src/js/services/go.js +++ b/src/js/services/go.js @@ -37,6 +37,8 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope, $state.transitionTo(path) .then(function() { if (cb) return cb(); + }, function() { + if (cb) return cb('animation in progress'); }); hideSidebars(); }; From 17deda9000ec4a4e3f5b1091c54eeeba581bd875 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 18 May 2015 16:21:36 -0300 Subject: [PATCH 016/250] unify strings to "payment". Add retry on balance update --- public/views/modals/tx-details.html | 4 +-- public/views/modals/tx-status.html | 23 +++++++++++---- public/views/modals/txp-details.html | 22 +++++++-------- public/views/walletHome.html | 37 ++++++++++++++++--------- src/js/controllers/index.js | 15 ++++++++-- src/js/controllers/walletHome.js | 10 +++---- src/js/services/notificationsService.js | 12 ++++---- src/js/services/txStatus.js | 24 +++++++++------- 8 files changed, 92 insertions(+), 55 deletions(-) diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 78ef455eb..70adbd499 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -22,7 +22,7 @@ -

Information

+

Details

  • To: @@ -68,7 +68,7 @@
-

Signatures

+

Participants

  • diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 7dfb917e3..5f24dacce 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -1,5 +1,5 @@ -
  • +
  • + email Notifications + + + Disabled + {{index.preferences.email}} + +
  • + +

     

  • diff --git a/src/js/routes.js b/src/js/routes.js index b407bc0e4..bae26b370 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -257,7 +257,18 @@ angular } }) - + .state('preferencesEmail', { + url: '/preferencesEmail', + templateUrl: 'views/preferencesEmail.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesEmail.html' + }, + + } + }) .state('preferencesBwsUrl', { url: '/preferencesBwsUrl', templateUrl: 'views/preferencesBwsUrl.html', @@ -397,6 +408,7 @@ angular preferencesAltCurrency: 12, preferencesBwsUrl: 12, preferencesAlias: 12, + preferencesEmail: 12, about: 12, logs: 13, add: 11, diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index a1794bbfe..6b8132e8e 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -390,6 +390,5 @@ angular.module('copayApp.services') }); }; - return root; }); From bf59f0c94f5a40c9d61f8360a10f520ad5e7a525 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 14 May 2015 17:21:45 -0300 Subject: [PATCH 020/250] new form for emails --- public/views/preferencesEmail.html | 39 ++++++++++++++++++++++++++ src/js/controllers/preferencesEmail.js | 28 ++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 public/views/preferencesEmail.html create mode 100644 src/js/controllers/preferencesEmail.js diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html new file mode 100644 index 000000000..dac07f5e9 --- /dev/null +++ b/public/views/preferencesEmail.html @@ -0,0 +1,39 @@ +
    +
    + + + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + Saving preferences... +
    +
    + + +
    +
    + + {{prefEmail.error|translate}} + +
    + + + + +
    +

    Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include be the positive confirmation of a bitcoin wallet and its balance, but no more. +

    +
    diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js new file mode 100644 index 000000000..140c41cd0 --- /dev/null +++ b/src/js/controllers/preferencesEmail.js @@ -0,0 +1,28 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesEmailController', + function($scope, go, profileService ,gettext, $log) { + this.save = function(form) { + this.error=null; + + if (!form.$valid) { + this.error = gettext('Invalid email'); + return; + } + +console.log('[preferencesEmail.js.12]', this.email); //TODO + var fc = profileService.focusedClient; + this.saving =true; + fc.savePreferences({email:this.email}, function(err) { + fc.saving =false; + if (err) { + $log.warn(err); + $scope.$emit('Local/ClientError', err); + return; + } + go.walletHome(); + }); + }; + + + }); From 1e7098e626fa06a1dd961d97904e8155d7f4ab1e Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 15 May 2015 11:04:37 -0300 Subject: [PATCH 021/250] fix /copayers title --- public/views/copayers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/copayers.html b/public/views/copayers.html index dd6acf5c9..b8109ab15 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -1,7 +1,7 @@
    + ng-init="">
    From a8a0023e386581dce4c95375c3ad90af5e7340c0 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 15 May 2015 11:07:19 -0300 Subject: [PATCH 022/250] ignore history server errors --- src/js/controllers/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index a77aeb446..c29a1efef 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -255,7 +255,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updatingTxHistory = false; if (err) { $log.debug('TxHistory ERROR:', err); - self.handleError(err); + // We do not should errors here, since history is usually + // fetched AFTER others requests. + //self.handleError(err); self.txHistoryError = true; } else { $log.debug('Wallet Transaction History:', txs); From 7bb6436d09b585cc7deca2260a37b01bed28de31 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 19 May 2015 12:01:11 -0300 Subject: [PATCH 023/250] update bwc --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index a924bcb97..3688bf161 100644 --- a/bower.json +++ b/bower.json @@ -16,7 +16,7 @@ "foundation-icon-fonts": "*", "ng-lodash": "~0.2.0", "angular-moment": "~0.9.0", - "angular-bitcore-wallet-client": "^0.0.21", + "angular-bitcore-wallet-client": "^0.0.22", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", "fastclick": "*", From 3917a0aea0405a429422f9f30073be785c4a66a3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 12:29:53 -0300 Subject: [PATCH 024/250] Fix paypro modal --- public/views/modals/paypro.html | 75 +++++++++++++++------------------ src/css/main.css | 4 +- 2 files changed, 37 insertions(+), 42 deletions(-) diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html index 24148fe29..bb03cdaab 100644 --- a/public/views/modals/paypro.html +++ b/public/views/modals/paypro.html @@ -6,53 +6,48 @@

    - Payment protocol request + Payment request

    -
    -
    -
    -
    - {{unitTotal}} {{unitName}} -
    -
    - {{ alternative }} {{ alternativeIsoCode }} -
    +
    +
    +
    + {{unitTotal}} {{unitName}}
    -
    - -
    - To: {{paypro.domain}} -
    - - -
    - Address: - - {{paypro.toAddress}} - -
    - - -
    - Certified by: - {{paypro.verifyData.caName}} - Untrusted -
    - -
    - Merchant message: - - {{paypro.memo}} - -
    - -
    - Expires: {{paypro.expires * 1000 | amTimeAgo }} +
    + {{ alternative }} {{ alternativeIsoCode }}
    + +

    Details

    +
      +
    • + Pay To: + {{paypro.domain}} +
    • +
    • + Address: + {{paypro.toAddress}} +
    • +
    • + Certified by: + + + {{paypro.verifyData.caName || paypro.verifyData}} + Untrusted + +
    • +
    • + Memo: + {{paypro.memo}} +
    • +
    • + Expires: + {{paypro.expires * 1000 | amTimeAgo }} +
    • +
    diff --git a/src/css/main.css b/src/css/main.css index de1227b61..551246265 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -835,8 +835,8 @@ label.postfix, a.postfix { .input.block i { position: absolute; - top: 5px; - left: 10px; + top: 2px; + left: 15px; font-size: 20px; color: #7A8C9E; border-right: 1px solid #ccc; From 837f6fced1eca4ae7d12a1d5acd26141093d8534 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 19 May 2015 14:10:47 -0300 Subject: [PATCH 025/250] update to current BWC --- public/views/preferences.html | 19 +++++---- public/views/preferencesEmail.html | 6 +-- src/js/controllers/index.js | 54 +++++++++++--------------- src/js/controllers/preferencesEmail.js | 19 +++++---- 4 files changed, 45 insertions(+), 53 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 8770b88a0..d431d8d17 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -20,6 +20,15 @@
  • +
  • + Email Notifications + + + Disabled + {{index.preferences.email}} + +
  • +
  • Color @@ -31,16 +40,6 @@ Encrypt Private Key
  • -
  • - email Notifications - - - Disabled - {{index.preferences.email}} - -
  • - -

     

  • diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index dac07f5e9..43280ba5e 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -22,7 +22,7 @@
-
+
{{prefEmail.error|translate}} @@ -32,8 +32,8 @@ + ng-style="{'background-color':index.backgroundColor}" ng-disabled="emailForm.$invalid && !index.preferences.email"> -

Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include be the positive confirmation of a bitcoin wallet and its balance, but no more. +

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.

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index c29a1efef..ff69df286 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -145,6 +145,20 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$emit('Local/TabChanged', tab); }; + + self.updatePreferences = function(cb) { + var fc = profileService.focusedClient; + fc.getPreferences(function(err, preferences) { + if (err) { + self.handleError(err); + return cb(err); + } + self.preferences = preferences; + return cb(err, preferences); + }); + }; + + self.updateAll = function(walletStatus, untilItChanges, initBalance, tries) { tries = tries || 0; if (untilItChanges && lodash.isUndefined(initBalance)) { @@ -192,6 +206,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.walletStatus = walletStatus.wallet.status; self.walletScanStatus = walletStatus.wallet.scanStatus; self.copayers = walletStatus.wallet.copayers; + self.preferences = walletStatus.preferences; self.setBalance(walletStatus.balance); $rootScope.$apply(); }); @@ -345,7 +360,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r lodash.each(txs, function(tx) { tx.ts = tx.minedTs || tx.sentTs; // no future transaction... - if (tx.ts > now) + if (tx.ts > now) ts.ts = now; tx.rateTs = Math.floor((tx.ts || now) / 1000); tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')( @@ -579,13 +594,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); }); - $rootScope.$on('Local/UnitSettingUpdated', function(event) { self.updateAll(); self.updateTxHistory(); }); + $rootScope.$on('Local/EmailUpdated', function(event, cb) { + self.updatePreferences(cb); + }); + $rootScope.$on('Local/BWSUpdated', function(event) { profileService.applyConfig(); }); @@ -665,7 +683,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r var msg = 'Error at Wallet Service: '; if (err.message) msg = msg + err.message; else if (err.error) msg = msg + err.error; - else msg = msg + err; + else msg = msg + (lodash.isObject(err) ? JSON.stringify(err) : err); self.clientError(msg); } $rootScope.$apply(); @@ -684,31 +702,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setDefaultLanguage(setLang); }); - $rootScope.$on('Animation/Disable', function(event) { - $timeout(function() { - self.slideLeft = false; - self.slideRight = false; - self.slideUp = false; - self.slideDown = false; - }, 400); - }); - - $rootScope.$on('Animation/SlideLeft', function(event) { - self.slideLeft = true; - }); - - $rootScope.$on('Animation/SlideRight', function(event) { - self.slideRight = true; - }); - - $rootScope.$on('Animation/SlideUp', function(event) { - self.slideUp = true; - }); - - $rootScope.$on('Animation/SlideDown', function(event) { - self.slideDown = true; - }); - $rootScope.$on('NewIncomingTx', function() { self.updateBalance(); $timeout(function() { @@ -716,10 +709,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r }, 5000); }); - - // remove transactionProposalRemoved (only for compat) - - lodash.each(['NewOutgoingTx', 'NewTxProposal', 'TxProposalFinallyRejected', 'transactionProposalRemoved', 'TxProposalRemoved', + lodash.each(['NewOutgoingTx', 'NewTxProposal', 'TxProposalFinallyRejected', 'TxProposalRemoved', 'Local/NewTxProposal', 'Local/TxProposalAction', 'ScanFinished' ], function(eventName) { $rootScope.$on(eventName, function(event, untilItChanges) { diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js index 140c41cd0..783ba82ee 100644 --- a/src/js/controllers/preferencesEmail.js +++ b/src/js/controllers/preferencesEmail.js @@ -1,26 +1,29 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesEmailController', - function($scope, go, profileService ,gettext, $log) { + function($scope, go, profileService, gettext, $log) { this.save = function(form) { - this.error=null; + this.error = null; - if (!form.$valid) { + if (!form.$valid && this.email) { this.error = gettext('Invalid email'); return; } -console.log('[preferencesEmail.js.12]', this.email); //TODO var fc = profileService.focusedClient; - this.saving =true; - fc.savePreferences({email:this.email}, function(err) { - fc.saving =false; + this.saving = true; + fc.savePreferences({ + email: this.email + }, function(err) { + fc.saving = false; if (err) { $log.warn(err); $scope.$emit('Local/ClientError', err); return; } - go.walletHome(); + $scope.$emit('Local/EmailUpdated', function(err){ + go.path('preferences'); + }); }); }; From 9b4e98753b8d64ffc39d9a1f13885fe6a363454f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 15:30:49 -0300 Subject: [PATCH 026/250] Fix strings for translation --- public/views/modals/confirmation.html | 4 ++-- public/views/preferencesAlias.html | 6 ++---- public/views/preferencesEmail.html | 8 ++++---- src/js/controllers/preferencesEmail.js | 8 ++------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/public/views/modals/confirmation.html b/public/views/modals/confirmation.html index a057c7a4e..1d56e2348 100644 --- a/public/views/modals/confirmation.html +++ b/public/views/modals/confirmation.html @@ -2,13 +2,13 @@

{{title|translate}}

-
-
diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index 6b7af95d0..ca1e90657 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -4,15 +4,13 @@ ng-init="titleSection='Wallet Alias'; goBackToState = 'preferences'">
- -
- +
-

Changing wallet alias only afects the local wallet name. +

Changing wallet alias only afects the local wallet name.

diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index 43280ba5e..55cac6990 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -17,7 +17,7 @@
- Saving preferences... + Saving preferences... @@ -29,11 +29,11 @@ - + - -

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. +

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.

diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js index 783ba82ee..241297501 100644 --- a/src/js/controllers/preferencesEmail.js +++ b/src/js/controllers/preferencesEmail.js @@ -3,19 +3,15 @@ angular.module('copayApp.controllers').controller('preferencesEmailController', function($scope, go, profileService, gettext, $log) { this.save = function(form) { + var self = this; this.error = null; - if (!form.$valid && this.email) { - this.error = gettext('Invalid email'); - return; - } - var fc = profileService.focusedClient; this.saving = true; fc.savePreferences({ email: this.email }, function(err) { - fc.saving = false; + self.saving = false; if (err) { $log.warn(err); $scope.$emit('Local/ClientError', err); From cb2e6e45cf112e868dd761ad98cf2df7ad41e54b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 17:08:03 -0300 Subject: [PATCH 027/250] Hide reference of wallets 1-1 on sidebar --- public/views/includes/sidebar.html | 8 ++++---- src/css/main.css | 1 + src/css/mobile.css | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 4f57af1d6..9ebccb657 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -8,15 +8,15 @@ ng-repeat="item in sidebar.wallets track by $index" ng-class="{'selected': item.id == index.walletId}" class="nav-item"> - +
{{(item.name || item.id) | limitTo: 1}}
-
{{item.name || item.id}}
-
{{item.m}} of {{item.n}}
+
{{item.name || item.id}}
+
{{item.m}} of {{item.n}}
  • - +
    diff --git a/src/css/main.css b/src/css/main.css index 551246265..d29a7c9b7 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -338,6 +338,7 @@ ul.manage li { .size-72 { font-size: 72px; } .m5 {margin: 5px;} .m5t {margin-top: 5px;} +.m8t {margin-top: 8px;} .m5b {margin-bottom: 5px;} .m5r {margin-right: 5px;} .m10 {margin: 10px;} diff --git a/src/css/mobile.css b/src/css/mobile.css index 252899b64..c9708913e 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -303,9 +303,7 @@ a.missing-copayers { } .sidebar header { - width: 100%; text-align: center; - height: 7rem; padding: 1.7rem; border-bottom: 1px solid #384B5F; } From 6d213a93ebec40732337b06dce0d7e23a5d8a8e7 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 17:48:47 -0300 Subject: [PATCH 028/250] Fix homewallet for 1-1 --- public/views/walletHome.html | 11 ++++++----- src/css/mobile.css | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 3c40e3ab7..562ecf832 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -113,18 +113,19 @@

    - {{index.m}} of {{index.n}} + {{index.walletName}}

    - Multisignature wallet - Testnet + Multisignature wallet ({{index.m}} of {{index.n}}) + - Testnet

    - {{index.m}} of {{index.n}} + {{index.walletName}}

    -
    - Personal Wallet - Testnet +
    + Testnet
    diff --git a/src/css/mobile.css b/src/css/mobile.css index c9708913e..32e8daa36 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -205,8 +205,8 @@ _:-ms-fullscreen, :root .main { .walletHome .wallet-info { margin-left: 85px; line-height: 110%; - float: left; - margin-bottom: 20px; + height: 60px; + overflow: hidden; } .copayers { From 58cc46de60f5aff09aaefe7c4ac96a94e64903cd Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 19 May 2015 18:18:19 -0300 Subject: [PATCH 029/250] Alias --- public/views/walletHome.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 562ecf832..7e24a8dac 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -113,7 +113,7 @@

    - {{index.walletName}} + {{(index.alias || index.walletName)}}

    Multisignature wallet ({{index.m}} of {{index.n}}) @@ -122,7 +122,7 @@

    - {{index.walletName}} + {{(index.alias || index.walletName)}}

    Testnet From ce0a7584b3b81909b1a84639df68641730472a2c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 04:05:13 -0300 Subject: [PATCH 030/250] Splits creating personal and multisign wallets --- public/views/create.html | 18 +++++++++++++++--- src/js/controllers/create.js | 11 ++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index cc04dddec..a62aadcdc 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -6,7 +6,7 @@ -
    + -
    +
    diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 02cbfa2d9..0aae93968 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -29,18 +29,19 @@ angular.module('copayApp.controllers').controller('createController', } var updateRCSelect = function(n) { + $scope.totalCopayers = n; var maxReq = COPAYER_PAIR_LIMITS[n]; self.RCValues = lodash.range(1, maxReq + 1); $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq); }; - $scope.$watch('totalCopayers', function(tc) { - updateRCSelect(tc); - }); - - this.TCValues = lodash.range(1, defaults.limits.totalCopayers + 1); + this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1); $scope.totalCopayers = defaults.wallet.totalCopayers; + this.setTotalCopayers = function(tc) { + updateRCSelect(tc); + }; + this.create = function(form) { if (form && form.$invalid) { this.error = gettext('Please enter the required fields'); From d0604331bd6650f29c4b60bfb1caa5d95ca99ff2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 10:36:01 -0300 Subject: [PATCH 031/250] Styling for tabs on create new wallet --- public/views/create.html | 12 +++++------- src/css/mobile.css | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index a62aadcdc..9c7ed15bf 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -21,15 +21,13 @@
    -
    +
    Personal + ng-class="{'selected': totalCopayers == 1}" + ng-click="create.setTotalCopayers(1)" translate>Personal Wallet Multisignature + ng-class="{'selected': totalCopayers != 1}" + ng-click="create.setTotalCopayers(3)" translate>Shared Wallet
    diff --git a/src/css/mobile.css b/src/css/mobile.css index 32e8daa36..40d2297d6 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -726,6 +726,34 @@ textarea:focus transform: translate3d(-100%, 0, 0) !important; } +.create-tab { + width: 100%; + border-bottom: 1px solid #DEDFE1; + margin-bottom: 25px; + padding: 0 0 .58rem; +} + +.create-tab a { + margin-left: 1.075rem; + margin-right: 1.575rem; + font-size: .7rem; + padding: 0 0 .6rem; + color: #929396; + text-transform: uppercase; +} + +.create-tab a:hover, +.create-tab a:focus { + color: #206ae3; +} + +.create-tab a.selected, +.create-tab a:active { + font-weight: 600; + color: #4683E8; + border-bottom: 3px solid #4683E8; +} + /* removes 300ms in IE */ -ms-touch-action: manipulation; /* IE10 / touch-action: manipulation; /* IE11+ */ From 2b655ed6c1f69c80a07d84e924b14913e754b818 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 10:48:52 -0300 Subject: [PATCH 032/250] Normalize colors --- src/css/mobile.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index 40d2297d6..f686dc8e5 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -729,8 +729,8 @@ textarea:focus .create-tab { width: 100%; border-bottom: 1px solid #DEDFE1; - margin-bottom: 25px; - padding: 0 0 .58rem; + margin-bottom: 20px; + padding: 0 0 .5rem; } .create-tab a { @@ -744,14 +744,14 @@ textarea:focus .create-tab a:hover, .create-tab a:focus { - color: #206ae3; + color: #2C3E50; } .create-tab a.selected, .create-tab a:active { font-weight: 600; - color: #4683E8; - border-bottom: 3px solid #4683E8; + color: #2C3E50; + border-bottom: 3px solid #2C3E50; } /* removes 300ms in IE */ From 9f6426388b7dc0097ef232737a72e64ac7a7d188 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 11:10:03 -0300 Subject: [PATCH 033/250] Fix to wide screen --- public/views/create.html | 4 ++++ src/css/mobile.css | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index 9c7ed15bf..e6333144a 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -22,12 +22,16 @@
    diff --git a/src/css/mobile.css b/src/css/mobile.css index f686dc8e5..63063bb38 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -729,13 +729,17 @@ textarea:focus .create-tab { width: 100%; border-bottom: 1px solid #DEDFE1; - margin-bottom: 20px; - padding: 0 0 .5rem; + margin-bottom: 25px; + padding: 0 0 .5rem 1rem; + overflow: hidden; +} + +.create-tab .tab-container { + float: left; + width: 50%; } .create-tab a { - margin-left: 1.075rem; - margin-right: 1.575rem; font-size: .7rem; padding: 0 0 .6rem; color: #929396; From 5b40a103b5e8709b2a5be9de3c501851efd38f51 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 13:45:31 -0300 Subject: [PATCH 034/250] Updates POT for translation --- po/es.po | 396 +++++++++++++++++++++++++-------------- po/template.pot | 279 ++++++++++++++++----------- public/views/import.html | 2 +- 3 files changed, 422 insertions(+), 255 deletions(-) diff --git a/po/es.po b/po/es.po index 38867ddc4..f6a6dc398 100644 --- a/po/es.po +++ b/po/es.po @@ -14,32 +14,32 @@ msgstr "" #: public/views/modals/txp-details.html msgid "" -"* Only transactions created by yourself with no peer signatures can be " +"* Only payment proposals created by yourself with no peer actions can be " "removed" msgstr "" -"* Solo transacciones creadas por Usted mismo y sin firmar, pueden ser " -"eliminadas" +"* Solo transacciones creadas por Usted mismo sin haber realizado acciones " +"por otros usuarios, pueden ser eliminadas" #: public/views/backup.html msgid "" -"* You can safely install your backup on other device and use your wallet " -"from many 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." msgstr "" "* Usted puede instalar la copia de seguridad en otro dispositivo y usar el " "monedero al mismo tiempo en varios dispositivos." -#: public/views/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "Monedero multifirma de bitcoin" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "Transacción finalmente rechazada" - #: public/views/preferences.html msgid "About Copay" msgstr "Acerca de Copay" +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Aceptar" + #: public/views/includes/sidebar.html msgid "Add wallet" msgstr "Agregar monedero" @@ -52,6 +52,18 @@ msgstr "Dirección" msgid "Advanced" msgstr "Avanzado" +#: public/views/create.html public/views/join.html +msgid "Advanced options" +msgstr "Opciones avanzadas" + +#: public/views/preferencesAlias.html +msgid "Alias for" +msgstr "Alias para" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "¿Ya dispone de un monedero?" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "Moneda Alternativa" @@ -114,8 +126,12 @@ msgid "Bitcoin address" msgstr "Dirección bitcoin" #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" -msgstr "Emitir Transacción" +msgid "Broadcast Payment" +msgstr "Enviar el Pago" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Enviando el Pago" #: src/js/controllers/walletHome.js msgid "Broadcasting transaction" @@ -141,8 +157,13 @@ msgstr "Cancelar" msgid "Certified by" msgstr "Certificado por" +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only afects the local wallet name." +msgstr "" +"Cambiar el alias del monedero solo afecta al nombre del monedero local." + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" msgstr "Seleccione el archivo backup de su computadora" #: public/views/includes/topbar.html public/views/modals/copayers.html @@ -167,13 +188,14 @@ msgid "Copayers" msgstr "Copayers" #: public/views/backup.html -msgid "Copy backup in a safe place" +msgid "Copy backup to a safe place" msgstr "Guardar copia de seguridad en un lugar seguro" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" +msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "" -"Copiar el texto como esta en un lugar seguro (notepad o correo electrónico)" +"Copiar el texto como esta en un lugar seguro (bloc de notas o correo " +"electrónico)" #: public/views/backup.html msgid "Copy to clipboard" @@ -255,7 +277,11 @@ msgstr "Crear, unirse o importar" msgid "Created by" msgstr "Creado por" -#: public/views/create.html public/views/splash/1.html +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Creando el Perfil..." + +#: public/views/create.html msgid "Creating Wallet..." msgstr "Creando Monedero..." @@ -267,6 +293,10 @@ msgstr "Creando transacción" msgid "Date" msgstr "Fecha" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Eliminar Propuesta de Pago" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "Eliminar monedero" @@ -280,8 +310,17 @@ msgid "Delete wallet" msgstr "Eliminar monedero" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" -msgstr "Eliminando transacción" +msgid "Deleting payment" +msgstr "Eliminando el Pago" + +#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Detalles" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Deshabilitado" #: public/views/backup.html msgid "Download backup" @@ -291,6 +330,10 @@ msgstr "Descargar copia de seguridad" msgid "ENTER" msgstr "ENTRAR" +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Notificaciones por Email" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Encriptar Clave Privada" @@ -344,7 +387,7 @@ msgstr "Francés" msgid "Funds received" msgstr "Fondos Recibidos" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "COMENZAR" @@ -356,6 +399,10 @@ msgstr "Generar nueva dirección" msgid "Global settings" msgstr "Opciones globales" +#: public/views/import.html +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 msgid "Hide" msgstr "Ocultar" @@ -380,18 +427,18 @@ msgstr "Si no se ingresa, una clave segura será generada" msgid "Import" msgstr "Importar" -#: public/views/import.html +#: public/views/import.html public/views/splash.html msgid "Import backup" msgstr "Importar copia de seguridad" -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -msgstr "Importar de Copay Beta 0.9" - #: public/views/importLegacy.html msgid "Import from the Cloud?" msgstr "¿Importar de la Nube?" +#: public/views/import.html +msgid "Import here" +msgstr "Importar aquí" + #: public/views/add.html msgid "Import wallet" msgstr "Importar monedero" @@ -404,10 +451,6 @@ msgstr "Importando monedero..." msgid "Importing..." msgstr "Importando..." -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Information" -msgstr "Información" - #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonés" @@ -449,7 +492,11 @@ msgstr "Master extended private key" msgid "Me" msgstr "Yo" -#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "Nota" + +#: public/views/modals/tx-details.html msgid "Merchant message" msgstr "Mensaje del negocio" @@ -478,8 +525,8 @@ msgid "Network" msgstr "Red" #: src/js/services/notificationsService.js -msgid "New Transaction" -msgstr "Nueva Transacción" +msgid "New Payment Proposal" +msgstr "Nueva Propuesta de Pago" #: public/views/modals/confirmation.html msgid "No" @@ -502,6 +549,10 @@ msgstr "Nota" msgid "OKAY" msgstr "LISTO" +#: public/views/modals/tx-details.html public/views/modals/txp-details.html +msgid "Participants" +msgstr "Participantes" + #: public/views/import.html public/views/importLegacy.html msgid "Password" msgstr "Contraseña" @@ -520,30 +571,82 @@ msgstr "Contraseña requerida" msgid "Passwords do not match" msgstr "Las contraseñas no coinciden" -#: public/views/import.html -msgid "Paste backup plain text code" -msgstr "Pegar copia de seguridad en texto plano" - #: public/views/join.html msgid "Paste invitation here" msgstr "Pegar invitación aquí" +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Pegar copia de seguridad en texto plano" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "Pagar A" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "El Pago fue Aceptado" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Propuesta de Pago" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Propuesta de Pago Creada" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Propuesta de Pago Rechazada" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Propuesta de Pago Rechazada por Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Sent" +msgstr "Propuesta de Pago Enviada" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Propuesta de Pago Firmada por Copayer" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Propuestas de Pago" + #: src/js/controllers/walletHome.js msgid "Payment Protocol not supported on Chrome App" msgstr "El protocolo de pagos no está soportado en Chrome" +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "El pago fue rechazado" + #: public/views/modals/tx-status.html msgid "Payment Sent" msgstr "Pago Enviado" +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "El pago fue aceptado..." + #: public/views/modals/txp-details.html msgid "Payment details" msgstr "Detalles del pago" +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "El pago fue finalmente rechazado" + #: public/views/modals/paypro.html -msgid "Payment protocol request" +msgid "Payment request" msgstr "Solicitud de pago" +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "¡Pago enviado!" + #: public/views/walletHome.html msgid "Payment to" msgstr "Pago a" @@ -553,7 +656,7 @@ msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" msgstr "" "Borrar permanentemente este monedero. ESTA ACCIÓN NO PUEDE SER REVERTIDA" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "Monedero Personal" @@ -594,17 +697,13 @@ msgid "Reject" msgstr "Rechazar" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" -msgstr "Rechazando transacción" +msgid "Rejecting payment" +msgstr "Rechazando el pago" #: public/views/preferencesAbout.html msgid "Release Information" msgstr "Información de la versión" -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "Elimine la transacción" - #: public/views/backup.html public/views/includes/password.html msgid "Repeat password" msgstr "Repite la contraseña" @@ -613,7 +712,7 @@ msgstr "Repite la contraseña" msgid "Required" msgstr "Requerido" -#: public/views/splash/1.html +#: public/views/splash.html msgid "Retrying..." msgstr "Reintentando..." @@ -625,10 +724,15 @@ msgstr "ESTABLECER" msgid "SKIP BACKUP" msgstr "OMITIR" -#: public/views/preferencesBwsUrl.html +#: public/views/preferencesAlias.html public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html msgid "Save" msgstr "Guardar" +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Guardando preferencias..." + #: src/js/services/notificationsService.js msgid "Scan Finished" msgstr "Escáner Finalizado" @@ -658,8 +762,8 @@ msgid "Select a wallet" msgstr "Seleccione un monedero" #: public/views/create.html -msgid "Select required signatures" -msgstr "Seleccione las firmas requeridas" +msgid "Select required number of signatures" +msgstr "Seleccione el número de firmas requeridas" #: public/views/create.html msgid "Select total number of copayers" @@ -694,6 +798,17 @@ msgstr "Establecer contraseña para tu copia de seguridad" 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." + #: public/views/walletHome.html msgid "Share address" msgstr "Compartir dirección" @@ -708,23 +823,23 @@ msgstr "Comparta esta invitación con sus copayers" #: public/views/walletHome.html msgid "" -"Share this with anyone to have them send you payments. To protect your " -"privacy, new addresses are generated automatically once you use them." +"Share this wallet address to receive payments. To protect your privacy, new " +"addresses are generated automatically once you use them." msgstr "" -"Compartir esto para que le envíen los pagos. Para proteger tu privacidad, " -"nuevas direcciones se generan automáticamente una vez que los usas." +"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/create.html public/views/join.html msgid "Show" msgstr "Mostrar" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "Firmar" - -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Signatures" -msgstr "Firmas" +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Firmando el pago" #: src/js/controllers/walletHome.js msgid "Signing transaction" @@ -734,10 +849,6 @@ msgstr "Firmando transacción" msgid "Spanish" msgstr "Español" -#: public/views/walletHome.html -msgid "Spend proposals" -msgstr "Propuestas de gastos" - #: src/js/controllers/copayers.js src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" @@ -748,8 +859,16 @@ msgid "Tap to retry" msgstr "Toque para reintentar" #: public/views/modals/txp-details.html -msgid "The transaction was removed by creator" -msgstr "La transacción fue eliminada por el creado" +msgid "The payment was removed by creator" +msgstr "El pago fue eliminado por el creado" + +#: 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." #: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -759,14 +878,6 @@ msgstr "El monedero \"{{walletName}}\" fue eliminado" msgid "There is an error in the form" msgstr "Hubo un error en el formulario" -#: public/views/backup.html -msgid "" -"This wallet have its private key encrypted. Exporting a backup will keep the " -"private key encrypted on the backup." -msgstr "" -"Este monedero tiene sus claves privadas encriptadas. Exportar una copia de " -"seguridad mantendrá la clave privada encriptada en la misma." - #: public/views/walletHome.html msgid "" "This wallet is not registered at the given Bitcore Wallet Service (BWS). You " @@ -780,8 +891,7 @@ msgid "Time" msgstr "Hora" #: public/views/walletHome.html public/views/includes/transaction.html -#: public/views/modals/paypro.html 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 "To" msgstr "Para" @@ -793,54 +903,10 @@ msgstr "Balance total bloqueado" msgid "Transaction" msgstr "Transacción" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "Transacción Rechazada" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "Transacción Enviada" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "Transacción Firmada" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "Transacción aceptada..." - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "Transacción enviada" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "Transacción finalmente rechazada" - #: src/js/controllers/walletHome.js msgid "Transaction not broadcasted. Please try again." msgstr "Transacción no emitida. Por favor, intente nuevamente." -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "Propuestas de transacción" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "Propuesta de transacción creada" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "Propuesta de transacción firmada" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "¡Transacción enviada!" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "Transacción rechazada" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "No se puede enviar propuesta de transacción" @@ -885,7 +951,7 @@ msgstr "ADVERTENCIA: Se requiere hacer copia de seguridad" msgid "WARNING: Wallet not registered" msgstr "ADVERTENCIA: Monedero no registrado" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "BIENVENIDO A COPAY" @@ -897,6 +963,10 @@ msgstr "Esperando copayers" msgid "Waiting..." msgstr "Esperando..." +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Alias del monedero" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "Este monedero ya fue importado: " @@ -942,7 +1012,7 @@ msgid "Yes" msgstr "Si" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "No tienes ningún monedero" #: public/views/backup.html public/views/import.html @@ -965,13 +1035,13 @@ msgstr "Contraseña de tu perfil" msgid "Your wallet has been imported correctly" msgstr "Su monedero se ha importado correctamente" -#: public/views/create.html public/views/join.html -msgid "advanced options" -msgstr "opciones avanzadas" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "email para recibir notificaciones" #: public/views/walletHome.html -msgid "in pending transactions" -msgstr "en transacciones pendientes" +msgid "in pending payments" +msgstr "en pagos pendientes" #: public/views/copayers.html public/views/create.html #: public/views/walletHome.html public/views/includes/sidebar.html @@ -982,6 +1052,10 @@ msgstr "de" msgid "optional" msgstr "opcional" +#: public/views/preferences.html +msgid "settings" +msgstr "configuración" + #: public/views/walletHome.html msgid "too long!" msgstr "¡demasiado largo!" @@ -990,10 +1064,6 @@ msgstr "¡demasiado largo!" msgid "wallet" msgstr "monedero" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" -msgstr "Opciones de {{index.walletName}}" - #: src/js/controllers/importLegacy.js msgid "" "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " @@ -1002,6 +1072,57 @@ msgstr "" "{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el " "balance actualizado" +#~ 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 "{{index.walletName}} settings" +#~ msgstr "Opciones de {{index.walletName}}" + #~ msgid "Transaction could not be deleted. Please try again." #~ msgstr "La transacción no se pudo eliminar. Por favor, intente nuevamente." @@ -1192,9 +1313,6 @@ msgstr "" #~ msgid "Copay now needs a profile to access wallets." #~ msgstr "Copay ahora requiere un perfil para acceder a los monederos" -#~ msgid "Create Profile" -#~ msgstr "Crear Perfil" - #~ msgid "Create in the cloud" #~ msgstr "Crear en la nube" @@ -1249,9 +1367,6 @@ msgstr "" #~ msgid "I read and agree with these terms" #~ msgstr "He leído y aceptado estos términos" -#~ msgid "Import Profile" -#~ msgstr "Importar Perfil" - #~ msgid "Import a backup" #~ msgstr "Importar una copia de seguridad" @@ -1451,9 +1566,6 @@ msgstr "" #~ msgid "Session will be closed" #~ msgstr "La sesión se cerrará" -#~ msgid "Settings" -#~ msgstr "Configuración" - #~ msgid "Share secret" #~ msgstr "Compartir código secreto" @@ -1463,9 +1575,6 @@ msgstr "" #~ msgid "Sign in" #~ msgstr "Ingresar" -#~ msgid "Signing out" -#~ msgstr "Saliendo" - #~ msgid "Skip public keys" #~ msgstr "Ignorar claves pública" @@ -1722,9 +1831,6 @@ msgstr "" #~ msgid "Connecting..." #~ msgstr "Conectando..." -#~ msgid "Create a new wallet" -#~ msgstr "Crear un nuevo monedero" - #~ 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 " diff --git a/po/template.pot b/po/template.pot index 1b6caacc6..e19ff203b 100644 --- a/po/template.pot +++ b/po/template.pot @@ -5,25 +5,25 @@ msgstr "" "Project-Id-Version: \n" #: public/views/modals/txp-details.html -msgid "* Only transactions created by yourself with no peer signatures can be removed" +msgid "* Only payment proposals created by yourself with no peer actions can be removed" msgstr "" #: public/views/backup.html -msgid "* You can safely install your backup on other device and use your wallet from many devices at the same time." +msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time." msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "" - #: public/views/preferences.html msgid "About Copay" msgstr "" +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "" + #: public/views/includes/sidebar.html msgid "Add wallet" msgstr "" @@ -37,6 +37,19 @@ msgstr "" msgid "Advanced" msgstr "" +#: public/views/create.html +#: public/views/join.html +msgid "Advanced options" +msgstr "" + +#: public/views/preferencesAlias.html +msgid "Alias for" +msgstr "" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "" @@ -99,7 +112,11 @@ msgid "Bitcoin address" msgstr "" #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" +msgid "Broadcast Payment" +msgstr "" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" msgstr "" #: src/js/controllers/walletHome.js @@ -127,8 +144,12 @@ msgstr "" msgid "Certified by" msgstr "" +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only afects the local wallet name." +msgstr "" + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" msgstr "" #: public/views/includes/topbar.html @@ -155,11 +176,11 @@ msgid "Copayers" msgstr "" #: public/views/backup.html -msgid "Copy backup in a safe place" +msgid "Copy backup to a safe place" msgstr "" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" +msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "" #: public/views/backup.html @@ -239,8 +260,11 @@ msgstr "" msgid "Created by" msgstr "" +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "" + #: public/views/create.html -#: public/views/splash/1.html msgid "Creating Wallet..." msgstr "" @@ -252,6 +276,10 @@ msgstr "" msgid "Date" msgstr "" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "" @@ -265,7 +293,17 @@ msgid "Delete wallet" msgstr "" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" +msgid "Deleting payment" +msgstr "" + +#: 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 @@ -276,6 +314,10 @@ msgstr "" msgid "ENTER" msgstr "" +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "" @@ -330,7 +372,7 @@ msgstr "" msgid "Funds received" msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "" @@ -342,6 +384,10 @@ msgstr "" msgid "Global settings" msgstr "" +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "" + #: public/views/create.html #: public/views/join.html msgid "Hide" @@ -368,17 +414,18 @@ msgid "Import" msgstr "" #: public/views/import.html +#: public/views/splash.html msgid "Import backup" msgstr "" -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -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 "" @@ -391,11 +438,6 @@ msgstr "" msgid "Importing..." msgstr "" -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Information" -msgstr "" - #: src/js/controllers/index.js msgid "Japanese" msgstr "" @@ -441,6 +483,9 @@ msgid "Me" msgstr "" #: public/views/modals/paypro.html +msgid "Memo" +msgstr "" + #: public/views/modals/tx-details.html msgid "Merchant message" msgstr "" @@ -470,7 +515,7 @@ msgid "Network" msgstr "" #: src/js/services/notificationsService.js -msgid "New Transaction" +msgid "New Payment Proposal" msgstr "" #: public/views/modals/confirmation.html @@ -495,6 +540,11 @@ msgstr "" 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" @@ -512,28 +562,80 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: public/views/import.html -msgid "Paste backup plain text code" -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 Sent" +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 "" +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "" + #: public/views/modals/tx-status.html 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 protocol request" +msgid "Payment request" +msgstr "" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" msgstr "" #: public/views/walletHome.html @@ -544,7 +646,7 @@ msgstr "" msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" msgstr "" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "" @@ -586,17 +688,13 @@ msgid "Reject" msgstr "" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" +msgid "Rejecting payment" msgstr "" #: public/views/preferencesAbout.html msgid "Release Information" msgstr "" -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "" - #: public/views/backup.html #: public/views/includes/password.html msgid "Repeat password" @@ -607,7 +705,7 @@ msgstr "" msgid "Required" msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "Retrying..." msgstr "" @@ -619,10 +717,16 @@ msgstr "" 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 "" @@ -652,7 +756,7 @@ msgid "Select a wallet" msgstr "" #: public/views/create.html -msgid "Select required signatures" +msgid "Select required number of signatures" msgstr "" #: public/views/create.html @@ -690,6 +794,10 @@ msgstr "" 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 "" @@ -703,7 +811,11 @@ msgid "Share this invitation with your copayers" msgstr "" #: public/views/walletHome.html -msgid "Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them." +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/create.html @@ -711,13 +823,8 @@ msgstr "" msgid "Show" msgstr "" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "" - -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Signatures" +#: src/js/controllers/walletHome.js +msgid "Signing payment" msgstr "" #: src/js/controllers/walletHome.js @@ -728,10 +835,6 @@ msgstr "" msgid "Spanish" msgstr "" -#: public/views/walletHome.html -msgid "Spend proposals" -msgstr "" - #: src/js/controllers/copayers.js #: src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js @@ -743,7 +846,11 @@ msgid "Tap to retry" msgstr "" #: public/views/modals/txp-details.html -msgid "The transaction was removed by creator" +msgid "The payment was removed by creator" +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 "" #: src/js/controllers/copayers.js @@ -755,10 +862,6 @@ msgstr "" msgid "There is an error in the form" msgstr "" -#: public/views/backup.html -msgid "This wallet have its private key encrypted. Exporting a backup will keep the private key encrypted on the backup." -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 "" @@ -769,7 +872,6 @@ msgstr "" #: public/views/walletHome.html #: public/views/includes/transaction.html -#: public/views/modals/paypro.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" @@ -783,54 +885,10 @@ msgstr "" msgid "Transaction" msgstr "" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "" - #: src/js/controllers/walletHome.js msgid "Transaction not broadcasted. Please try again." msgstr "" -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "" @@ -876,7 +934,7 @@ msgstr "" msgid "WARNING: Wallet not registered" msgstr "" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "" @@ -888,6 +946,10 @@ msgstr "" msgid "Waiting..." msgstr "" +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "" @@ -929,7 +991,7 @@ msgid "Yes" msgstr "" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "" #: public/views/backup.html @@ -954,13 +1016,12 @@ msgstr "" msgid "Your wallet has been imported correctly" msgstr "" -#: public/views/create.html -#: public/views/join.html -msgid "advanced options" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" msgstr "" #: public/views/walletHome.html -msgid "in pending transactions" +msgid "in pending payments" msgstr "" #: public/views/copayers.html @@ -974,6 +1035,10 @@ msgstr "" msgid "optional" msgstr "" +#: public/views/preferences.html +msgid "settings" +msgstr "" + #: public/views/walletHome.html msgid "too long!" msgstr "" @@ -982,10 +1047,6 @@ msgstr "" msgid "wallet" msgstr "" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" -msgstr "" - #: src/js/controllers/importLegacy.js msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" msgstr "" diff --git a/public/views/import.html b/public/views/import.html index 7ea436bce..5bcaa27ef 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -57,7 +57,7 @@

    Have a Backup from Copay v0.9?

    - From 52a655de2d9477b21e23a659c0618d1f14f7a168 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 21 May 2015 02:57:26 +0900 Subject: [PATCH 035/250] Fixed jp --- po/ja.po | 362 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 240 insertions(+), 122 deletions(-) diff --git a/po/ja.po b/po/ja.po index 162f39528..aaf48c671 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,31 +14,31 @@ msgstr "" #: public/views/modals/txp-details.html msgid "" -"* Only transactions created by yourself with no peer signatures can be " +"* Only payment proposals created by yourself with no peer actions can be " "removed" msgstr "" "* 自分が提案した取引で他の参加者が署名していない取引提案のみ破棄されます。" #: public/views/backup.html msgid "" -"* You can safely install your backup on other device and use your wallet " -"from many 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." msgstr "" "* 安全にバックアップを別のデバイスにインポートして、同じウォレットを複数の端" "末でご利用いただけます。" -#: public/views/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "マルチシグネチャビットコインウォレット" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "取引がようやく却下されました" - #: 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 "ウォレットを追加" @@ -51,6 +51,18 @@ msgstr "アドレス" msgid "Advanced" msgstr "上級者向け" +#: public/views/create.html public/views/join.html +msgid "Advanced options" +msgstr "詳細設定" + +#: public/views/preferencesAlias.html +msgid "Alias for" +msgstr "ウォレット通称" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "すでにウォレットをお持ちですか?" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "表示通貨" @@ -113,9 +125,13 @@ msgid "Bitcoin address" msgstr "ビットコインアドレス" #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" +msgid "Broadcast Payment" msgstr "取引送信" +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "取引送信中" + #: src/js/controllers/walletHome.js msgid "Broadcasting transaction" msgstr "取引送信中" @@ -140,8 +156,12 @@ msgstr "キャンセル" msgid "Certified by" msgstr "証明元:" +#: public/views/preferencesAlias.html +msgid "Changing wallet alias only afects the local wallet name." +msgstr "ウォレット通称を変更しても、この端末でしか変わりません。" + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" msgstr "パソコンからバックアップファイルを選択して下さい。" #: public/views/includes/topbar.html public/views/modals/copayers.html @@ -166,11 +186,11 @@ msgid "Copayers" msgstr "ウォレット参加者" #: public/views/backup.html -msgid "Copy backup in a safe place" +msgid "Copy backup to a safe place" msgstr "安全な場所でバックアップを保管して下さい" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" +msgid "Copy this text as it is to a safe place (notepad or email)" msgstr "" "このテキストを安全な場所に貼り付けて保管して下さい (メモ帳やメールの下書きな" "ど)" @@ -256,7 +276,11 @@ msgstr "作成、参加、インポート" msgid "Created by" msgstr "作成者:" -#: public/views/create.html public/views/splash/1.html +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "ウォレット作成中…" + +#: public/views/create.html msgid "Creating Wallet..." msgstr "ウォレット作成中…" @@ -268,6 +292,10 @@ msgstr "取引作成中…" msgid "Date" msgstr "日付" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "ペイメント提案を削除" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "ウォレットを削除" @@ -281,9 +309,18 @@ msgid "Delete wallet" msgstr "ウォレットを削除" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" +msgid "Deleting payment" msgstr "取引削除中…" +#: 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 "Download backup" msgstr "バックアップをダウンロード" @@ -292,6 +329,10 @@ msgstr "バックアップをダウンロード" msgid "ENTER" msgstr "ENTER" +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "メールのお知らせ" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "秘密鍵を暗号化" @@ -345,7 +386,7 @@ msgstr "フランス語" msgid "Funds received" msgstr "着金あり" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "はじめよう" @@ -357,6 +398,10 @@ msgstr "新規アドレスを生成" msgid "Global settings" msgstr "グローバル設定" +#: public/views/import.html +msgid "Have a Backup from Copay v0.9?" +msgstr "Copay v0.9 のバックアップをお持ちですか?" + #: public/views/create.html public/views/join.html msgid "Hide" msgstr "非表示" @@ -381,18 +426,18 @@ msgstr "空欄の場合、安全な鍵を生成します。" msgid "Import" msgstr "インポート" -#: public/views/import.html +#: public/views/import.html public/views/splash.html msgid "Import backup" msgstr "バックアップをインポート" -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -msgstr "Copay Beta 0.9からのインポート" - #: 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 "ウォレットをインポート" @@ -405,10 +450,6 @@ msgstr "ウォレットインポート中…" msgid "Importing..." msgstr "インポート中…" -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Information" -msgstr "情報" - #: src/js/controllers/index.js msgid "Japanese" msgstr "日本語" @@ -450,7 +491,11 @@ msgstr "マスタ拡張秘密鍵" msgid "Me" msgstr "自分" -#: public/views/modals/paypro.html public/views/modals/tx-details.html +#: public/views/modals/paypro.html +msgid "Memo" +msgstr "メモ" + +#: public/views/modals/tx-details.html msgid "Merchant message" msgstr "お店からのメッセージ:" @@ -479,8 +524,8 @@ msgid "Network" msgstr "ネットワーク" #: src/js/services/notificationsService.js -msgid "New Transaction" -msgstr "新規取引" +msgid "New Payment Proposal" +msgstr "新しいペイメント提案" #: public/views/modals/confirmation.html msgid "No" @@ -503,6 +548,10 @@ msgstr "メモ" msgid "OKAY" msgstr "OK" +#: 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 "パスワード" @@ -521,30 +570,82 @@ msgstr "パスワードが必要" msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: public/views/import.html -msgid "Paste backup plain text code" -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 Sent" +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 "クロームのアプリではペイメントプロトコールがサポートされていません。" +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "ペイメントが却下されました" + #: public/views/modals/tx-status.html 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 protocol request" +msgid "Payment request" msgstr "ペイメントプロトコル要求" +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "ペイメントを送信しました!" + #: public/views/walletHome.html msgid "Payment to" msgstr "支払い先" @@ -555,7 +656,7 @@ msgstr "" "永久にこのウォレットを削除。\n" "二度と取り戻せない行為ですのどご注意下さい。" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "個人用ウォレット" @@ -596,17 +697,13 @@ msgid "Reject" msgstr "却下" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" -msgstr "取引却下中…" +msgid "Rejecting payment" +msgstr "ペイメント却下中" #: public/views/preferencesAbout.html msgid "Release Information" msgstr "リリース情報" -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "取引を削除" - #: public/views/backup.html public/views/includes/password.html msgid "Repeat password" msgstr "パスワードを再入力" @@ -615,7 +712,7 @@ msgstr "パスワードを再入力" msgid "Required" msgstr "入力必須" -#: public/views/splash/1.html +#: public/views/splash.html msgid "Retrying..." msgstr "再度試しています…" @@ -627,10 +724,15 @@ msgstr "指定" msgid "SKIP BACKUP" msgstr "バックアップをスキップ" -#: public/views/preferencesBwsUrl.html +#: 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 "スキャン完了" @@ -660,7 +762,7 @@ msgid "Select a wallet" msgstr "ウォレットを選択" #: public/views/create.html -msgid "Select required signatures" +msgid "Select required number of signatures" msgstr "必要な署名の数を選択" #: public/views/create.html @@ -696,6 +798,16 @@ msgstr "バックアップのパスワードを設定して下さい" 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 "アドレスを共有" @@ -710,24 +822,24 @@ msgstr "ウォレット参加者にこの招待コードを送って下さい。 #: public/views/walletHome.html msgid "" -"Share this with anyone to have them send you payments. To protect your " -"privacy, new addresses are generated automatically once you use them." +"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/create.html public/views/join.html msgid "Show" msgstr "表示" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "署名する" - -#: public/views/modals/tx-details.html public/views/modals/txp-details.html -msgid "Signatures" -msgstr "署名" +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "ペイメント署名中" #: src/js/controllers/walletHome.js msgid "Signing transaction" @@ -737,10 +849,6 @@ msgstr "取引署名中" msgid "Spanish" msgstr "スペイン語" -#: public/views/walletHome.html -msgid "Spend proposals" -msgstr "取引提案" - #: src/js/controllers/copayers.js src/js/controllers/import.js #: src/js/controllers/preferencesDelete.js msgid "Success" @@ -751,8 +859,16 @@ msgid "Tap to retry" msgstr "タップしてやり直し" #: public/views/modals/txp-details.html -msgid "The transaction was removed by creator" -msgstr "取引が作成者により削除されました" +msgid "The payment was removed by creator" +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 "" +"このウォレットの秘密鍵が暗号化されています。バックアップをエクスポートすると" +"秘密鍵が暗号化された状態でバックアップアーカイブとして守られます。" #: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" @@ -762,14 +878,6 @@ msgstr "ウォレット \"{{walletName}}\" が削除されました" msgid "There is an error in the form" msgstr "フォームにエラーがありました" -#: public/views/backup.html -msgid "" -"This wallet have its private key encrypted. Exporting a backup will keep the " -"private key encrypted on the backup." -msgstr "" -"このウォレットの秘密鍵が暗号化されています。バックアップをエクスポートすると" -"送金時と同じパスワードが掛かった状態でエクスポートされます。" - #: public/views/walletHome.html msgid "" "This wallet is not registered at the given Bitcore Wallet Service (BWS). You " @@ -783,8 +891,7 @@ msgid "Time" msgstr "時刻" #: public/views/walletHome.html public/views/includes/transaction.html -#: public/views/modals/paypro.html 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 "To" msgstr "宛先" @@ -796,54 +903,10 @@ msgstr "ロック中の残高" msgid "Transaction" msgstr "取引" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "取引が却下されました" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "取引送信しました!" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "取引署名済み" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "取引受理済み…" - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "取引送信済み" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "取引が却下されました" - #: src/js/controllers/walletHome.js msgid "Transaction not broadcasted. Please try again." msgstr "取引が送信できませんでした。やり直して下さい。" -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "取引提案" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "取引提案が作成されました" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "取引提案が署名されました" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "取引送信しました!" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "取引が却下されました" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "取引提案を送れませんでした。" @@ -888,7 +951,7 @@ msgstr "注意:バックアップが必要です" msgid "WARNING: Wallet not registered" msgstr "注意:ウォレットが未登録" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "ようこそ COPAY へ" @@ -900,6 +963,10 @@ msgstr "ウォレット参加者を待っています" msgid "Waiting..." msgstr "少々お待ち下さい…" +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "ウォレットの通称" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "ウォレットがすでにインポート済み:" @@ -945,7 +1012,7 @@ msgid "Yes" msgstr "はい" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "ウォレットがありません" #: public/views/backup.html public/views/import.html @@ -968,13 +1035,13 @@ msgstr "プロフィールパスワード" msgid "Your wallet has been imported correctly" msgstr "ウォレットが正常にインポートされました。" -#: public/views/create.html public/views/join.html -msgid "advanced options" -msgstr "詳細設定" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "メールによるウォレットのお知らせ" #: public/views/walletHome.html -msgid "in pending transactions" -msgstr "未対応取引" +msgid "in pending payments" +msgstr "未対応ペイメント" #: public/views/copayers.html public/views/create.html #: public/views/walletHome.html public/views/includes/sidebar.html @@ -985,6 +1052,10 @@ msgstr "of" msgid "optional" msgstr "任意" +#: public/views/preferences.html +msgid "settings" +msgstr "設定" + #: public/views/walletHome.html msgid "too long!" msgstr "長すぎます!" @@ -993,10 +1064,6 @@ msgstr "長すぎます!" msgid "wallet" msgstr "ウォレット" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" -msgstr "{{index.walletName}} 設定" - #: src/js/controllers/importLegacy.js msgid "" "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " @@ -1004,3 +1071,54 @@ msgid "" msgstr "" "{{len}} 個のウォレットをインポートしました。残高照会中のため、少々お待ち下さ" "い。" + +#~ msgid "A transaction was finally rejected" +#~ msgstr "取引がようやく却下されました" + +#~ msgid "Import from Copay Beta 0.9" +#~ msgstr "Copay Beta 0.9からのインポート" + +#~ msgid "Information" +#~ msgstr "情報" + +#~ msgid "New Transaction" +#~ msgstr "新規取引" + +#~ msgid "Remove transaction" +#~ msgstr "取引を削除" + +#~ msgid "Sign" +#~ msgstr "署名する" + +#~ msgid "Signatures" +#~ msgstr "署名" + +#~ msgid "Spend proposals" +#~ msgstr "取引提案" + +#~ msgid "Transaction Rejected" +#~ msgstr "取引が却下されました" + +#~ msgid "Transaction Sent" +#~ msgstr "取引送信しました!" + +#~ msgid "Transaction Signed" +#~ msgstr "取引署名済み" + +#~ msgid "Transaction broadcasted" +#~ msgstr "取引送信済み" + +#~ msgid "Transaction proposal" +#~ msgstr "取引提案" + +#~ msgid "Transaction proposal signed" +#~ msgstr "取引提案が署名されました" + +#~ msgid "Transaction sent!" +#~ msgstr "取引送信しました!" + +#~ msgid "Transaction was rejected" +#~ msgstr "取引が却下されました" + +#~ msgid "{{index.walletName}} settings" +#~ msgstr "{{index.walletName}} 設定" From 2f421669412cbaf22814c4d0bf4200e7001596ff Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 21 May 2015 02:58:47 +0900 Subject: [PATCH 036/250] Remove old translations --- po/ja.po | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/po/ja.po b/po/ja.po index aaf48c671..3d0c893f4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1071,54 +1071,3 @@ msgid "" msgstr "" "{{len}} 個のウォレットをインポートしました。残高照会中のため、少々お待ち下さ" "い。" - -#~ msgid "A transaction was finally rejected" -#~ msgstr "取引がようやく却下されました" - -#~ msgid "Import from Copay Beta 0.9" -#~ msgstr "Copay Beta 0.9からのインポート" - -#~ msgid "Information" -#~ msgstr "情報" - -#~ msgid "New Transaction" -#~ msgstr "新規取引" - -#~ msgid "Remove transaction" -#~ msgstr "取引を削除" - -#~ msgid "Sign" -#~ msgstr "署名する" - -#~ msgid "Signatures" -#~ msgstr "署名" - -#~ msgid "Spend proposals" -#~ msgstr "取引提案" - -#~ msgid "Transaction Rejected" -#~ msgstr "取引が却下されました" - -#~ msgid "Transaction Sent" -#~ msgstr "取引送信しました!" - -#~ msgid "Transaction Signed" -#~ msgstr "取引署名済み" - -#~ msgid "Transaction broadcasted" -#~ msgstr "取引送信済み" - -#~ msgid "Transaction proposal" -#~ msgstr "取引提案" - -#~ msgid "Transaction proposal signed" -#~ msgstr "取引提案が署名されました" - -#~ msgid "Transaction sent!" -#~ msgstr "取引送信しました!" - -#~ msgid "Transaction was rejected" -#~ msgstr "取引が却下されました" - -#~ msgid "{{index.walletName}} settings" -#~ msgstr "{{index.walletName}} 設定" From f63a52821622ea89052f3a5acb91bce663519a67 Mon Sep 17 00:00:00 2001 From: Kirvx Date: Wed, 20 May 2015 19:52:59 +0200 Subject: [PATCH 037/250] Update fr.po Update fr.po Update es.po Update template.pot --- po/es.po | 2 +- po/fr.po | 304 +++++++++++++++++++++++++++++------------------- po/template.pot | 2 +- 3 files changed, 185 insertions(+), 123 deletions(-) diff --git a/po/es.po b/po/es.po index f6a6dc398..1d35c633d 100644 --- a/po/es.po +++ b/po/es.po @@ -158,7 +158,7 @@ msgid "Certified by" msgstr "Certificado por" #: public/views/preferencesAlias.html -msgid "Changing wallet alias only afects the local wallet name." +msgid "Changing wallet alias only affects the local wallet name." msgstr "" "Cambiar el alias del monedero solo afecta al nombre del monedero local." diff --git a/po/fr.po b/po/fr.po index 0f624bce4..01df8a64e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,25 +13,25 @@ msgstr "" "X-Generator: Poedit 1.6.10\n" #: public/views/modals/txp-details.html -msgid "* Only transactions created by yourself with no peer signatures can be removed" -msgstr "Seules les transactions créées par vous-même sans signatures de pairs peuvent être supprimées" +msgid "* Only payment proposals created by yourself with no peer actions can be removed" +msgstr "Seules les propositions de transactions créées par vous-même avec aucune action de pairs peuvent être supprimées" #: public/views/backup.html -msgid "* You can safely install your backup on other device and use your wallet from many devices at the same time." +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/splash/1.html +#: public/views/splash.html msgid "A multisignature bitcoin wallet" msgstr "Un portefeuille bitcoin multi-signatures" -#: src/js/services/notificationsService.js -msgid "A transaction was finally rejected" -msgstr "Une transaction a été finalement rejetée" - #: public/views/preferences.html msgid "About Copay" msgstr "À propos de Copay" +#: public/views/modals/txp-details.html +msgid "Accept" +msgstr "Accepter" + #: public/views/includes/sidebar.html msgid "Add wallet" msgstr "Ajouter un portefeuille" @@ -45,6 +45,19 @@ msgstr "Adresse" msgid "Advanced" msgstr "Avancés" +#: public/views/create.html +#: public/views/join.html +msgid "Advanced options" +msgstr "Options avancées" + +#: public/views/preferencesAlias.html +msgid "Alias for" +msgstr "" + +#: public/views/splash.html +msgid "Already have a wallet?" +msgstr "Vous avez déjà un portefeuille ?" + #: public/views/preferences.html msgid "Alternative Currency" msgstr "Devise alternative" @@ -107,8 +120,12 @@ msgid "Bitcoin address" msgstr "Adresse Bitcoin" #: public/views/modals/txp-details.html -msgid "Broadcast Transaction" -msgstr "Diffuser transaction" +msgid "Broadcast Payment" +msgstr "Diffuser le paiement" + +#: src/js/controllers/walletHome.js +msgid "Broadcasting Payment" +msgstr "Diffusion du paiement" #: src/js/controllers/walletHome.js msgid "Broadcasting transaction" @@ -135,8 +152,12 @@ msgstr "Annuler" msgid "Certified by" msgstr "Certifié par" +#: public/views/preferencesAlias.html +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." + #: public/views/import.html -msgid "Choose backup file from your computer" +msgid "Choose a backup file from your computer" msgstr "Choisissez un fichier de sauvegarde depuis votre ordinateur" #: public/views/includes/topbar.html @@ -163,12 +184,12 @@ msgid "Copayers" msgstr "Copayers" #: public/views/backup.html -msgid "Copy backup in a safe place" -msgstr "Copiez la sauvegarde dans un endroit sûr" +msgid "Copy backup to a safe place" +msgstr "Copiez la sauvegarde vers un endroit sûr" #: public/views/backup.html -msgid "Copy this text as it is in a safe place (notepad or email)" -msgstr "Copiez le texte dans un endroit sûr (bloc-notes ou e-mail)" +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 msgid "Copy to clipboard" @@ -247,8 +268,11 @@ msgstr "Créer, rejoindre ou importer" msgid "Created by" msgstr "Créée par" +#: public/views/splash.html +msgid "Creating Profile..." +msgstr "Création du profile..." + #: public/views/create.html -#: public/views/splash/1.html msgid "Creating Wallet..." msgstr "Création du portefeuille..." @@ -260,6 +284,10 @@ msgstr "Création de la transaction" msgid "Date" msgstr "Date" +#: public/views/modals/txp-details.html +msgid "Delete Payment Proposal" +msgstr "Supprimer la proposition de paiement" + #: public/views/preferencesAdvanced.html msgid "Delete Wallet" msgstr "Supprimer le portefeuille" @@ -273,8 +301,18 @@ msgid "Delete wallet" msgstr "Supprimer le portefeuille" #: src/js/controllers/walletHome.js -msgid "Deleting transaction" -msgstr "Suppression de la transaction" +msgid "Deleting payment" +msgstr "Suppression du paiement" + +#: public/views/modals/paypro.html +#: public/views/modals/tx-details.html +#: public/views/modals/txp-details.html +msgid "Details" +msgstr "Détails" + +#: public/views/preferences.html +msgid "Disabled" +msgstr "Désactivé" #: public/views/backup.html msgid "Download backup" @@ -284,6 +322,10 @@ msgstr "Télécharger la sauvegarde" msgid "ENTER" msgstr "ENTRER" +#: public/views/preferences.html +msgid "Email Notifications" +msgstr "Notifications e-mail" + #: public/views/preferences.html msgid "Encrypt Private Key" msgstr "Chiffrer la clé privée" @@ -338,7 +380,7 @@ msgstr "Français" msgid "Funds received" msgstr "Fonds reçus" -#: public/views/splash/1.html +#: public/views/splash.html msgid "GET STARTED" msgstr "COMMENCER" @@ -350,6 +392,10 @@ msgstr "Générer une nouvelle adresse" msgid "Global settings" msgstr "Paramètres globaux" +#: public/views/import.html +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 msgid "Hide" @@ -376,17 +422,18 @@ msgid "Import" msgstr "Importer" #: public/views/import.html +#: public/views/splash.html msgid "Import backup" msgstr "Importer une sauvegarde" -#: public/views/add.html -msgid "Import from Copay Beta 0.9" -msgstr "Importer depuis Copay Beta 0.9" - #: public/views/importLegacy.html msgid "Import from the Cloud?" msgstr "Importer depuis le Cloud ?" +#: public/views/import.html +msgid "Import here" +msgstr "Importer ici" + #: public/views/add.html msgid "Import wallet" msgstr "Importer un portefeuille" @@ -399,11 +446,6 @@ msgstr "Importation du portefeuille..." msgid "Importing..." msgstr "Importation..." -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Information" -msgstr "Informations" - #: src/js/controllers/index.js msgid "Japanese" msgstr "Japonais" @@ -478,8 +520,8 @@ msgid "Network" msgstr "Réseau" #: src/js/services/notificationsService.js -msgid "New Transaction" -msgstr "Nouvelle transaction" +msgid "New Payment Proposal" +msgstr "Nouvelle proposition de paiement" #: public/views/modals/confirmation.html msgid "No" @@ -503,6 +545,11 @@ msgstr "Note :" msgid "OKAY" msgstr "Ok" +#: 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" @@ -520,29 +567,81 @@ msgstr "Mot de passe nécessaire" msgid "Passwords do not match" msgstr "Le mot de passe ne correspond pas" -#: public/views/import.html -msgid "Paste backup plain text code" -msgstr "Coller le code texte de sauvegarde" - #: public/views/join.html msgid "Paste invitation here" msgstr "Collez l'invitation ici" +#: public/views/import.html +msgid "Paste the backup plain text code" +msgstr "Coller le code texte de sauvegarde" + +#: public/views/modals/paypro.html +msgid "Pay To" +msgstr "" + +#: public/views/modals/tx-status.html +msgid "Payment Accepted" +msgstr "Paiement accepté" + +#: public/views/modals/txp-details.html +msgid "Payment Proposal" +msgstr "Proposition de paiement" + +#: public/views/modals/tx-status.html +msgid "Payment Proposal Created" +msgstr "Proposition de paiement créée" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected" +msgstr "Proposition de paiement rejetée" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Rejected by Copayer" +msgstr "Proposition de paiement rejetée par les Copayer" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Sent" +msgstr "Proposition de paiement envoyée" + +#: src/js/services/notificationsService.js +msgid "Payment Proposal Signed by Copayer" +msgstr "Proposition de paiement signée par les Copayers" + +#: public/views/walletHome.html +msgid "Payment Proposals" +msgstr "Propositions de paiement" + #: src/js/controllers/walletHome.js msgid "Payment Protocol not supported on Chrome App" msgstr "Le protocole de paiement n'est pas supporté sur l'application Chrome" +#: public/views/modals/tx-status.html +msgid "Payment Rejected" +msgstr "Paiement rejeté" + #: public/views/modals/tx-status.html msgid "Payment Sent" msgstr "Paiement envoyé" +#: public/views/modals/txp-details.html +msgid "Payment accepted..." +msgstr "Paiement accepté..." + #: public/views/modals/txp-details.html msgid "Payment details" -msgstr "Détails de paiement" +msgstr "Détails du paiement" + +#: public/views/modals/txp-details.html +msgid "Payment finally rejected" +msgstr "Paiement finalement rejeté" #: public/views/modals/paypro.html -msgid "Payment protocol request" -msgstr "Demande de protocole de paiement" +msgid "Payment request" +msgstr "Demande de paiement" + +#: public/views/modals/txp-details.html +msgid "Payment sent!" +msgstr "Paiement envoyé !" #: public/views/walletHome.html msgid "Payment to" @@ -552,7 +651,7 @@ msgstr "Paiement à" msgid "Permanently delete this wallet. THIS ACTION CANNONT BE REVERSED" msgstr "Supprimer définitivement ce portefeuille. CETTE ACTION NE PEUT PAS ÊTRE ANNULÉE" -#: public/views/walletHome.html +#: public/views/create.html msgid "Personal Wallet" msgstr "Portefeuille personnel" @@ -594,17 +693,13 @@ msgid "Reject" msgstr "Rejeter" #: src/js/controllers/walletHome.js -msgid "Rejecting transaction" -msgstr "" +msgid "Rejecting payment" +msgstr "Rejet du paiement" #: public/views/preferencesAbout.html msgid "Release Information" msgstr "Libérer l'information" -#: public/views/modals/txp-details.html -msgid "Remove transaction" -msgstr "Supprimer la transaction" - #: public/views/backup.html #: public/views/includes/password.html msgid "Repeat password" @@ -615,7 +710,7 @@ msgstr "Répétez le mot de passe" msgid "Required" msgstr "Requis" -#: public/views/splash/1.html +#: public/views/splash.html msgid "Retrying..." msgstr "Nouvelle tentative" @@ -627,9 +722,15 @@ msgstr "DEFINIR" msgid "SKIP BACKUP" msgstr "IGNORER" +#: public/views/preferencesAlias.html #: public/views/preferencesBwsUrl.html +#: public/views/preferencesEmail.html msgid "Save" -msgstr "Sauvegarder" +msgstr "Enregistrer" + +#: public/views/preferencesEmail.html +msgid "Saving preferences..." +msgstr "Enregistrement des préférences..." #: src/js/services/notificationsService.js msgid "Scan Finished" @@ -660,7 +761,7 @@ msgid "Select a wallet" msgstr "Sélectionner un portefeuille" #: public/views/create.html -msgid "Select required signatures" +msgid "Select required number of signatures" msgstr "Sélectionnez le nombre de signatures requises" #: public/views/create.html @@ -698,6 +799,10 @@ msgstr "Définissez un mot de passe pour votre sauvegarde" msgid "Set up a password" msgstr "Définir un mot de passe" +#: 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 "Définir des notifications e-mail peut affaiblir votre vie privée si le fournisseur du service de portefeuille est compromis. Les informations disponibles à un attaquant incluent les adresses de votre portefeuille et leurs soldes, mais rien de plus." + #: public/views/walletHome.html msgid "Share address" msgstr "Partager l'adresse" @@ -711,22 +816,21 @@ msgid "Share this secret with your copayers" msgstr "Partagez ce secret avec vos copayers" #: public/views/walletHome.html -msgid "Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them." -msgstr "Partagez ceci avec quiconque pour recevoir des paiements. Pour protéger votre anonymat, de nouvelles adresses sont générées automatiquement une fois que vous les utilisez." +msgid "Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them." +msgstr "Partagez cette adresse de portefeuille pour recevoir des paiements. Pour protéger votre anonymat, de nouvelles adresses sont générées automatiquement une fois que vous les utilisez." -#: public/views/create.html +#: public/views/create.html +msgid "Shared Wallet" +msgstr "Portefeuille partagé" + +#: public/views/create.html #: public/views/join.html msgid "Show" msgstr "Montrer" -#: public/views/modals/txp-details.html -msgid "Sign" -msgstr "Signer" - -#: public/views/modals/tx-details.html -#: public/views/modals/txp-details.html -msgid "Signatures" -msgstr "Signatures" +#: src/js/controllers/walletHome.js +msgid "Signing payment" +msgstr "Signature du paiement" #: src/js/controllers/walletHome.js msgid "Signing transaction" @@ -751,8 +855,12 @@ msgid "Tap to retry" msgstr "Tapez pour réessayer" #: public/views/modals/txp-details.html -msgid "The transaction was removed by creator" -msgstr "La transaction a été supprimée par le créateur" +msgid "The payment was removed by creator" +msgstr "Le paiement a été supprimé par le créateur" + +#: 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." #: src/js/controllers/copayers.js #: src/js/controllers/preferencesDelete.js @@ -763,10 +871,6 @@ msgstr "Le portefeuille \"{{walletName}}\" a été supprimé" msgid "There is an error in the form" msgstr "Il y a une erreur dans la forme" -#: public/views/backup.html -msgid "This wallet have its private key encrypted. Exporting a backup will keep the private key encrypted on the backup." -msgstr "Ce portefeuille a sa clé privée chiffrée. Exporter une sauvegarde gardera la clé privée chiffrée lors de la sauvegarde." - #: 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." @@ -777,7 +881,6 @@ msgstr "Temps" #: public/views/walletHome.html #: public/views/includes/transaction.html -#: public/views/modals/paypro.html #: public/views/modals/tx-details.html #: public/views/modals/txp-details.html msgid "To" @@ -791,54 +894,10 @@ msgstr "Solde verrouillé total" msgid "Transaction" msgstr "Transaction" -#: src/js/services/notificationsService.js -msgid "Transaction Rejected" -msgstr "Transaction rejetée" - -#: src/js/services/notificationsService.js -msgid "Transaction Sent" -msgstr "Transaction envoyée" - -#: src/js/services/notificationsService.js -msgid "Transaction Signed" -msgstr "Transaction signée" - -#: public/views/modals/txp-details.html -msgid "Transaction accepted..." -msgstr "Transaction acceptée..." - -#: src/js/services/txStatus.js -msgid "Transaction broadcasted" -msgstr "Transaction diffusée" - -#: public/views/modals/txp-details.html -msgid "Transaction finally rejected" -msgstr "Transaction finalement rejetée" - #: src/js/controllers/walletHome.js msgid "Transaction not broadcasted. Please try again." msgstr "Transaction non diffusée. Veuillez réessayer." -#: public/views/modals/txp-details.html -msgid "Transaction proposal" -msgstr "Proposition de transaction" - -#: src/js/services/txStatus.js -msgid "Transaction proposal created" -msgstr "Proposition de transaction créée" - -#: src/js/services/txStatus.js -msgid "Transaction proposal signed" -msgstr "Proposition de transaction signée" - -#: public/views/modals/txp-details.html -msgid "Transaction sent!" -msgstr "Transaction envoyée !" - -#: src/js/services/txStatus.js -msgid "Transaction was rejected" -msgstr "La transaction a été rejetée" - #: src/js/controllers/walletHome.js msgid "Unable to send transaction proposal" msgstr "Impossible d'envoyer la proposition de transaction" @@ -884,7 +943,7 @@ msgstr "ATTENTION : Sauvegarde nécessaire" msgid "WARNING: Wallet not registered" msgstr "ATTENTION : Portefeuille non enregistré" -#: public/views/splash/1.html +#: public/views/splash.html msgid "WELCOME TO COPAY" msgstr "BIENVENUE SUR COPAY" @@ -896,6 +955,10 @@ msgstr "Attente des copayers" msgid "Waiting..." msgstr "Attente..." +#: public/views/preferences.html +msgid "Wallet Alias" +msgstr "Alias de portefeuille" + #: src/js/services/profileService.js msgid "Wallet Already Imported:" msgstr "Portefeuille déjà importé :" @@ -937,7 +1000,7 @@ msgid "Yes" msgstr "Oui" #: public/views/walletHome.html -msgid "You do not have any wallet" +msgid "You do not have a wallet" msgstr "Vous n'avez aucun portefeuille" #: public/views/backup.html @@ -962,14 +1025,13 @@ msgstr "Votre mot de passe de profil" msgid "Your wallet has been imported correctly" msgstr "Votre portefeuille a été correctement importé" -#: public/views/create.html -#: public/views/join.html -msgid "advanced options" -msgstr "les options avancées" +#: public/views/preferencesEmail.html +msgid "email for wallet notifications" +msgstr "e-mail pour les notifications de portefeuille" #: public/views/walletHome.html -msgid "in pending transactions" -msgstr "dans les transactions en attente" +msgid "in pending payments" +msgstr "dans les paiements en attente" #: public/views/copayers.html #: public/views/create.html @@ -982,6 +1044,10 @@ msgstr "de" msgid "optional" msgstr "optionnel" +#: public/views/preferences.html +msgid "settings" +msgstr "paramètres" + #: public/views/walletHome.html msgid "too long!" msgstr "trop long !" @@ -990,10 +1056,6 @@ msgstr "trop long !" msgid "wallet" msgstr "portefeuille" -#: public/views/preferences.html -msgid "{{index.walletName}} settings" -msgstr "{{index.walletName}} paramètres" - #: 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/po/template.pot b/po/template.pot index e19ff203b..0aa8eaf0b 100644 --- a/po/template.pot +++ b/po/template.pot @@ -145,7 +145,7 @@ msgid "Certified by" msgstr "" #: public/views/preferencesAlias.html -msgid "Changing wallet alias only afects the local wallet name." +msgid "Changing wallet alias only affects the local wallet name." msgstr "" #: public/views/import.html From fe50717d6cc0e09c2b991d3827d5c0a8411f6492 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 May 2015 15:16:39 -0300 Subject: [PATCH 038/250] Fix create wallet for wp8.1 --- public/views/create.html | 4 ++-- src/js/controllers/create.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index e6333144a..31713598b 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -21,7 +21,7 @@
    -
    +
    From a513e155abf69d24261119bd5b2cbf4a8a796aaf Mon Sep 17 00:00:00 2001 From: Kirvx Date: Wed, 20 May 2015 21:25:08 +0200 Subject: [PATCH 040/250] Update fr.po --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 01df8a64e..daca358eb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -52,7 +52,7 @@ msgstr "Options avancées" #: public/views/preferencesAlias.html msgid "Alias for" -msgstr "" +msgstr "Alias pour" #: public/views/splash.html msgid "Already have a wallet?" @@ -577,7 +577,7 @@ msgstr "Coller le code texte de sauvegarde" #: public/views/modals/paypro.html msgid "Pay To" -msgstr "" +msgstr "Payer à" #: public/views/modals/tx-status.html msgid "Payment Accepted" From 63db556cefb5ba0fd9f2e1b47161c50a1d0c4e07 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 10:30:19 -0300 Subject: [PATCH 041/250] Splash with rounded buttons --- public/views/splash.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/splash.html b/public/views/splash.html index 92cef28fa..9fca6a0b6 100644 --- a/public/views/splash.html +++ b/public/views/splash.html @@ -26,8 +26,8 @@
    - +

    Already have a wallet?

    - +
    From 89b751a6be139f679326073dadf058f429420f2f Mon Sep 17 00:00:00 2001 From: dabura667 Date: Thu, 21 May 2015 23:37:49 +0900 Subject: [PATCH 042/250] Update ja.po --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 3d0c893f4..93382e1ad 100644 --- a/po/ja.po +++ b/po/ja.po @@ -157,7 +157,7 @@ msgid "Certified by" msgstr "証明元:" #: public/views/preferencesAlias.html -msgid "Changing wallet alias only afects the local wallet name." +msgid "Changing wallet alias only affects the local wallet name." msgstr "ウォレット通称を変更しても、この端末でしか変わりません。" #: public/views/import.html From 3b8fff5bff99fb39216ec1b39fe0935ab59b66a3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 15:44:09 -0300 Subject: [PATCH 043/250] Disables opening link by long time pressing. Active button --- src/css/main.css | 90 +++++++++++++++------------------------------- src/css/mobile.css | 2 ++ 2 files changed, 30 insertions(+), 62 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index d29a7c9b7..cdfda1aaf 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -646,7 +646,12 @@ button.outline.light-gray:focus { color: #7A8C9E; } -.button.outline.white { +.button.outline.white, +.button.outline.white:hover, +.button.outline.white:focus, +button.outline.white, +button.outline.white:hover, +button.outline.white:focus { background-color: transparent; border: 1px solid #fff; color: #fff; @@ -687,59 +692,53 @@ button.warning:focus, /* WHITE */ button.white, -.button.white { +button.white:hover, +button.white:focus, +.button.white, +.button.white:hover, +.button.white:focus { background-color: #fff; color: #2C3E50; } /* BLACK */ button.black, -.button.black { +button.black:hover, +button.black:focus, +.button.black, +.button.black:hover, +.button.black:focus { background-color: #2C3E50; color: #fff; } /* GRAY */ button.gray, -.button.gray { +button.gray:hover, +button.gray:focus, +.button.gray, +.button.gray:hover, +.button.gray:focus { background-color: #A9B2B8; color: #2C3E50; } button.disabled, button[disabled], .button.disabled, .button[disabled] { - border-color: transparent; -} - -button.disabled.black, -button[disabled].black, -.button.disabled.black, -.button[disabled].black, -button.disabled.white, -button[disabled].white, -.button.disabled.white, -.button[disabled].white, -button.disabled.warning, -button[disabled].warning, -.button.disabled.warning, -.button[disabled].warning, -button.disabled.primary, -button[disabled].primary, -.button.disabled.primary, -.button[disabled].primary, -button.disabled.secondary, -button[disabled].secondary, -.button.disabled.secondary, -.button[disabled].secondary { + border-color: transparent !important; background-color: #A5B2BF !important; - color: #fff; + color: #fff !important; } - .button, button { text-transform: uppercase; transition: none !important; } +.button:active, button:active { + background: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); + background: linear-gradient(to bottom, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); +} + .button:focus, button:focus { outline:0; } @@ -797,39 +796,6 @@ label.postfix, a.postfix { width: 40px; } -.photo-container { - margin-right: 3px; - display: inline-block; - width: 35px; - height: 35px; - color: #fff; - background: #7A8C9E; - border-radius: 100%; - vertical-align: middle; - overflow: hidden; - text-align: center; -} - -.photo-container.profile { - width: 80px; - height: 80px; -} - -.need-backup { - background: #ED4A43; - -moz-box-shadow: 1px 1px 0px 0px #A02F23; - box-shadow: 1px 1px 0px 0px #A02F23; - position: absolute; - top: 22px; - left: 0px; - width: 14px; - height: 14px; - border-radius: 100%; - font-size: 9px; - padding-top: 2px; - color: #fff; -} - .pointer { cursor: pointer; } diff --git a/src/css/mobile.css b/src/css/mobile.css index 63063bb38..7c810d919 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -11,6 +11,7 @@ body { -khtml-user-select: none; -ms-user-select: none; user-select: none; + -webkit-touch-callout: none !important; } input { @@ -617,6 +618,7 @@ input:focus, select:focus, textarea:focus { + outline: 0; opacity: 1; /*CSS transitions*/ -o-transition-property: none !important; From aade8cd84bcff2c929cb75461c8aec9f1a1ee0f6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 16:04:44 -0300 Subject: [PATCH 044/250] No gradient for active button --- src/css/main.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index cdfda1aaf..b25d4fd1f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -734,11 +734,6 @@ button.disabled, button[disabled], .button.disabled, .button[disabled] { transition: none !important; } -.button:active, button:active { - background: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); - background: linear-gradient(to bottom, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); -} - .button:focus, button:focus { outline:0; } From eb58604692313035ed387589e70d299c4a6bca1b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 16:11:00 -0300 Subject: [PATCH 045/250] Fix back button --- src/js/init.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/init.js b/src/js/init.js index 8cacff9a5..a0070e3f7 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -36,10 +36,10 @@ angular.element(document).ready(function() { document.addEventListener('backbutton', function() { var loc = window.location; if (loc.toString().match(/index\.html#\/$/)) { - navigator.app.exitApp(); + navigator.app.exitApp(); } else { - window.location = '#/walletHome'; + window.location = '#/cordova/walletHome'; } }, false); From 6d5f39610254a451d7908e425ff8f5b883f8abda Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 17:25:14 -0300 Subject: [PATCH 046/250] Disable button after pressing --- public/views/create.html | 2 +- public/views/import.html | 18 +++++------- public/views/importLegacy.html | 54 +++++++++++++--------------------- public/views/join.html | 3 +- 4 files changed, 32 insertions(+), 45 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index 31713598b..14f1c6abd 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -103,7 +103,7 @@
    - diff --git a/public/views/import.html b/public/views/import.html index 5bcaa27ef..6c6213392 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -19,7 +19,7 @@
    -
    +
    @@ -50,19 +50,17 @@ name="password" ng-model="import.password">
    -
    -

    Have a Backup from Copay v0.9?

    - - - -
    +
    +

    Have a Backup from Copay v0.9?

    + +
    diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html index cc0476816..ceac39936 100644 --- a/public/views/importLegacy.html +++ b/public/views/importLegacy.html @@ -4,26 +4,24 @@ ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
    - -
    - +
    From 4708f6b9c4ec9a055ae5ea0b5ff77dce381a6330 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 22 May 2015 16:41:30 -0300 Subject: [PATCH 047/250] Fix animation and topbar --- public/views/modals/copayers.html | 6 +++--- src/css/main.css | 2 +- src/css/mobile.css | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/public/views/modals/copayers.html b/public/views/modals/copayers.html index c1c167e42..f637ba62c 100644 --- a/public/views/modals/copayers.html +++ b/public/views/modals/copayers.html @@ -12,13 +12,13 @@ - +
    -
    - diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html index 6d12d1cab..aa2245893 100644 --- a/public/views/modals/scanner.html +++ b/public/views/modals/scanner.html @@ -10,7 +10,7 @@ -
    + diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 70adbd499..61a24fb57 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -12,7 +12,7 @@ -
    + -
    diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index a8c2cf21d..4153c07bc 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -11,7 +11,7 @@ -
    + +
    -
    diff --git a/src/css/mobile.css b/src/css/mobile.css index 43fa04246..04dea09e8 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -28,7 +28,7 @@ input { -webkit-tap-highlight-color:rgba(0,0,0,0); } -body, div, .row { +.touch { -webkit-overflow-scrolling: touch; } @@ -90,11 +90,7 @@ _:-ms-fullscreen, :root .main { .tab-bar { background: #FFFFFF; - display: block; - position: fixed; - width: 100%; z-index: 5; - line-height: 3.2rem; border-bottom: 1px solid #E9E9EC; } @@ -563,12 +559,19 @@ to prevent collapsing during animation*/ top: 0 !important; } +.modal-content { + position: fixed; + overflow-y: auto; + height: 100%; + width: 100%; + top: 33px; + padding-bottom: 33px; +} + .reveal-modal { padding: 0; border: none; border-radius: 0; - overflow-y: auto; - padding-bottom: 20px; outline: 0; } From 7d4f3e425bbee296376694f420424448d92c2c23 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 29 May 2015 16:38:45 -0300 Subject: [PATCH 071/250] fix copayers buttons --- public/views/copayers.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/public/views/copayers.html b/public/views/copayers.html index b8109ab15..e773637f2 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -1,5 +1,5 @@ -
    @@ -8,7 +8,7 @@
    -

    Share this invitation with your copayers

    +

    Share this invitation with your copayers

    @@ -21,9 +21,9 @@
    - - + Share invitation
    @@ -31,7 +31,7 @@ Waiting for copayers [ {{index.m}} of {{index.n}} ] - +
    @@ -48,7 +48,7 @@

    Wallet incomplete and broken

    Delete it and create a new one

    -
    @@ -58,4 +58,3 @@
    - From 4d832258ee76d7a5c887d1815a287019d4fd9738 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 29 May 2015 16:50:11 -0300 Subject: [PATCH 072/250] fix create tabs --- public/views/create.html | 14 ++++++++------ src/css/mobile.css | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index 14f1c6abd..0a2bdb423 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -21,17 +21,19 @@ -
    -
    @@ -62,7 +64,7 @@
  • +
  • + Bitcoin Network Fee Policy + + + {{preferences.feeName}} + +
  • +
  • Bitcore Wallet Service diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html new file mode 100644 index 000000000..fb4885cb6 --- /dev/null +++ b/public/views/preferencesFee.html @@ -0,0 +1,14 @@ +
    +
    + + +
    +
    + {{fee.name}} ({{fee.value}} bits per kB) + +
    +
    +
    diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 608010349..664e67d3b 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -443,7 +443,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.availableBalanceBTC = strip(self.availableBalanceBTC / COIN); // KB to send max - self.feePerKbSat = config.feePerKbSat || 10000; + self.feePerKbSat = config.feeValue || 10000; if (balance.totalKbToSendMax) { var feeToSendMaxSat = balance.totalKbToSendMax * self.feePerKbSat; diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js index 742db5a84..e19db43dc 100644 --- a/src/js/controllers/preferences.js +++ b/src/js/controllers/preferences.js @@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesController', function($scope, $rootScope, $filter, $timeout, $modal, $log, lodash, configService, profileService) { var config = configService.getSync(); this.unitName = config.wallet.settings.unitName; + this.feeName = config.wallet.settings.feeName || 'Priority'; this.bwsurl = config.bws.url; this.selectedAlternative = { name: config.wallet.settings.alternativeName, diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js new file mode 100644 index 000000000..2ae1f6b88 --- /dev/null +++ b/src/js/controllers/preferencesFee.js @@ -0,0 +1,35 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('preferencesFeeController', + function($rootScope, $scope, configService, go) { + var config = configService.getSync(); + this.feeName = config.wallet.settings.feeName || 'Priority'; + this.feeOpts = [{ + name: 'Priority', + value: 100, + }, { + name: 'Normal', + value: 50, + }, { + name: 'Economy', + value: 10, + }]; + + this.save = function(newFee) { + var opts = { + wallet: { + settings: { + feeName: newFee.name, + feeValue: newFee.value * 100, + } + } + }; + this.feeName = newFee.name; + + configService.set(opts, function(err) { + if (err) console.log(err); + $scope.$emit('Local/UnitSettingUpdated'); + }); + + }; + }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index ac631efa4..6a53c4401 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -608,6 +608,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi amount: amount, message: comment, payProUrl: paypro ? paypro.url : null, + feePerKb: config.feeValue || 10000, }, function(err, txp) { if (err) { self.setOngoingProcess(); diff --git a/src/js/routes.js b/src/js/routes.js index 1db5d9a8a..14b74f7f2 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -245,6 +245,18 @@ angular }, } }) + .state('preferencesFee', { + url: '/preferencesFee', + templateUrl: 'views/preferencesFee.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/preferencesFee.html' + }, + } + }) + .state('preferencesAdvanced', { url: '/preferencesAdvanced', templateUrl: 'views/preferencesAdvanced.html', @@ -451,6 +463,7 @@ angular delete: 13, preferencesLanguage: 12, preferencesUnit: 12, + preferencesFee: 12, preferencesAltCurrency: 12, preferencesBwsUrl: 12, preferencesAlias: 12, From d2e61603ceb8e3086b4575c395002a5d938dd675 Mon Sep 17 00:00:00 2001 From: dabura667 Date: Sat, 20 Jun 2015 20:18:51 +0900 Subject: [PATCH 166/250] Fix Japanese --- po/ja.po | 9 ++++++--- po/template.pot | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index fb4b084f6..596ff6828 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,10 +14,13 @@ msgstr "" #: public/views/modals/txp-details.html msgid "" -"* Only payment proposals created by yourself with no peer actions can be " -"removed" +"* 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 "" diff --git a/po/template.pot b/po/template.pot index ae813da0d..b915e0fec 100644 --- a/po/template.pot +++ b/po/template.pot @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" #: public/views/modals/txp-details.html -msgid "* Only payment proposals created by yourself with no peer actions can be removed" +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 "" #: public/views/backup.html From d1c55e087691f639af8f2407521144ac125aa7e3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 22 Jun 2015 11:33:53 -0300 Subject: [PATCH 167/250] Adds Fee to TXP modal --- public/views/modals/txp-details.html | 4 ++++ src/js/controllers/index.js | 1 + src/js/controllers/walletHome.js | 1 + 3 files changed, 6 insertions(+) diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 2b24ff00d..e1aaa244d 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -24,6 +24,10 @@ {{alternativeAmountStr}}
  • +
  • + Fee: + {{feeStr}} +
  • Time: diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 664e67d3b..9d2501bb5 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -349,6 +349,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r lodash.each(txps, function(tx) { var amount = tx.amount * self.satToUnit; tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; + 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; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 6a53c4401..0f909c3a7 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -132,6 +132,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $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; From 0cdda72086ead8e408a911637958b78edd365ca4 Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 22 Jun 2015 14:35:16 -0300 Subject: [PATCH 168/250] add style on send all --- public/views/walletHome.html | 10 +++++----- src/css/main.css | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 516364234..5e298ed0f 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -278,14 +278,14 @@

    - +
    -
    +
    Available Balance: {{index.availableBalanceStr }} @@ -294,9 +294,9 @@
    - +
    -
    +
    Available Balance: {{index.availableBalanceStr }} diff --git a/src/css/main.css b/src/css/main.css index f344b4dfd..2d627661c 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -49,6 +49,13 @@ h4.title { font-size: 0.7rem; } +h4.title a { + text-transform: none; + font-weight: 400; + margin-top: 7px; + font-size: 12px; +} + body, html{ height:100%; width:100%; From 14401312ce0a2f960433be54361fc4c0bb17d0a9 Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 22 Jun 2015 14:40:20 -0300 Subject: [PATCH 169/250] fix padding --- src/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/main.css b/src/css/main.css index 2d627661c..2300e15d3 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -52,7 +52,7 @@ h4.title { h4.title a { text-transform: none; font-weight: 400; - margin-top: 7px; + padding: 7px; font-size: 12px; } From 304e16337f2596cf6821f1a9e87025f7118facd7 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 22 Jun 2015 15:42:39 -0300 Subject: [PATCH 170/250] Fixes confirmation popup for send-all on devices --- src/js/controllers/walletHome.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 0f909c3a7..635217a3d 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -924,14 +924,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; this.sendAll = function(amount, feeStr) { + var self = this; var msg = gettextCatalog.getString("{{fee}} will be discounted for bitcoin networking fees", { fee: feeStr }); if (isCordova) { navigator.notification.confirm( msg, - this._doSendAll(amount), - 'OK', 'Cancel' + function(buttonIndex) { + if (buttonIndex == 1) + $timeout(function() { + self._doSendAll(amount); + }, 1); + } ); } else { if (confirm(msg)) From 56597ea65cd7ade3f2e88e950905a9f47b0351b6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 22 Jun 2015 17:12:54 -0300 Subject: [PATCH 171/250] Adds translated strings --- po/es.po | 240 +++++++++++++++++---------- po/template.pot | 32 ++++ public/views/preferences.html | 2 +- public/views/preferencesFee.html | 2 +- src/js/controllers/preferencesFee.js | 8 +- 5 files changed, 187 insertions(+), 97 deletions(-) diff --git a/po/es.po b/po/es.po index 4ff861167..80d088e09 100644 --- a/po/es.po +++ b/po/es.po @@ -14,11 +14,13 @@ msgstr "" #: public/views/modals/txp-details.html msgid "" -"* Only payment proposals created by yourself with no peer actions can be " -"removed" +"* 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 "" -"* Solo transacciones creadas por Usted mismo sin haber realizado acciones " -"por otros usuarios, pueden ser eliminadas" +"* Una propuesta de pago puede ser eliminada si 1) Ud. es el creador, y " +"ningún otro copayer la ha firmado, o 2) hayan transcurrido 24 horas desde la " +"creación de la propuesta." #: public/views/backup.html msgid "" @@ -117,6 +119,10 @@ msgstr "" "Antes de recibir fondos, es altamente recomendable realizar una copia de " "seguridad." +#: public/views/preferences.html +msgid "Bitcoin Network Fee Policy" +msgstr "Política de Costo de la Red Bitcoin" + #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" msgstr "¡Bitcoin URI no es válida!" @@ -283,7 +289,7 @@ msgstr "No se puede actualizar el monedero" msgid "Create" msgstr "Crear" -#: public/views/add.html +#: public/views/add.html public/views/create.html msgid "Create new wallet" msgstr "Crear nuevo monedero" @@ -340,6 +346,10 @@ 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" @@ -352,6 +362,10 @@ msgstr "Descargar copia de seguridad" msgid "ENTER" msgstr "ENTRAR" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Económico" + #: public/views/preferences.html msgid "Email Notifications" msgstr "Notificaciones por Email" @@ -396,6 +410,10 @@ msgstr "Falló al importar monederos" msgid "Family vacation funds" msgstr "Fondos para vacaciones en familia" +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Costo" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -421,6 +439,10 @@ msgstr "Generar nueva dirección" msgid "Global settings" msgstr "Opciones globales" +#: public/views/disclaimer.html +msgid "Go back" +msgstr "Volver" + #: public/views/import.html msgid "Have a Backup from Copay v0.9?" msgstr "¿Tiene una copia de seguridad de Copay v0.9?" @@ -437,6 +459,10 @@ msgstr "Historial" msgid "Home" msgstr "Inicio" +#: public/views/disclaimer.html +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 msgid "If not given, a secure key will be generated" msgstr "Si no se ingresa, una clave segura será generada" @@ -554,6 +580,10 @@ msgstr "No" msgid "No transactions yet" msgstr "Sin transacciones todavía" +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Normal" + #: public/views/walletHome.html msgid "Not valid" msgstr "No válido" @@ -690,6 +720,10 @@ msgstr "Portugués" msgid "Preferences" msgstr "Preferencias" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Prioritario" + #: public/views/modals/scanner.html msgid "QR-Scanner" msgstr "Escáner QR" @@ -796,6 +830,10 @@ msgstr "Seleccione el total de copayers" msgid "Send" msgstr "Enviar" +#: public/views/walletHome.html +msgid "Send All" +msgstr "Enviar Todo" + #: public/views/backup.html public/views/preferencesLogs.html msgid "Send by email" msgstr "Enviar por correo electrónico" @@ -880,6 +918,10 @@ msgstr "Listo" msgid "Tap to retry" msgstr "Toque para reintentar" +#: public/views/disclaimer.html public/views/preferencesAbout.html +msgid "Terms of Use" +msgstr "Términos de Uso" + #: public/views/create.html msgid "Testnet" msgstr "Testnet" @@ -920,6 +962,93 @@ 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." + #: src/js/controllers/copayers.js src/js/controllers/preferencesDelete.js msgid "The wallet \"{{walletName}}\" was deleted" msgstr "El monedero \"{{walletName}}\" fue eliminado" @@ -1077,6 +1206,10 @@ msgstr "Contraseña de tu perfil" msgid "Your wallet has been imported correctly" msgstr "Su monedero se ha importado correctamente" +#: public/views/preferencesFee.html +msgid "bits per kB" +msgstr "bits por kB" + #: public/views/preferencesEmail.html msgid "email for wallet notifications" msgstr "email para recibir notificaciones" @@ -1102,6 +1235,10 @@ msgstr "configuración" msgid "too long!" msgstr "¡demasiado largo!" +#: 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" + #: src/js/controllers/importLegacy.js msgid "" "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated " @@ -1110,6 +1247,13 @@ msgstr "" "{{len}} monederos importados. Escáner de fondos en progreso. Espere a ver el " "balance actualizado" +#~ 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" @@ -1414,9 +1558,6 @@ msgstr "" #~ msgid "Hide them" #~ msgstr "Ocultar" -#~ msgid "I read and agree with these terms" -#~ msgstr "He leído y aceptado estos términos" - #~ msgid "Import a backup" #~ msgstr "Importar una copia de seguridad" @@ -1646,80 +1787,6 @@ msgstr "" #~ msgid "The secret string you entered is invalid" #~ msgstr "La palabra secreta ingresada no es válida" -#~ msgid "" -#~ "The software you are about to use is free, open source, and unsupported " -#~ "beta software. It is important to understand\n" -#~ " that beta software refers to software that is undergoing testing " -#~ "and has not officially been released, could have\n" -#~ " bugs, and may not act in a reliable fashion. Because the software " -#~ "is currently in beta, it is possible but not certain\n" -#~ " that you may lose bitcoin or the value of your bitcoin. It is " -#~ "recommended that you store only nominal amounts of\n" -#~ " bitcoins. You acknowledge that your use of this software is at your " -#~ "own discretion and in compliance with all\n" -#~ " applicable laws. You are responsible for safekeeping your login " -#~ "IDs, passwords, private key pairs, PINs and any other\n" -#~ " codes you use to access the software. IF YOU HAVE NOT SEPARATELY " -#~ "STORED A BACKUP OF ANY WALLET ADDRESSES AND PRIVATE\n" -#~ " KEY PAIRS MAINTAINED IN YOUR ACCOUNT, YOU ACKNOWLEDGE AND AGREE " -#~ "THAT ANY BITCOINS YOU HAVE ASSOCIATED WITH SUCH WALLET\n" -#~ " ADDRESSES WILL BECOME INACCESSIBLE IF YOU DO NOT HAVE YOUR ACCOUNT " -#~ "PASSWORD AND/OR PIN. All transaction requests are\n" -#~ " irreversible. The authors of the software, employees and " -#~ "affiliates of Bitpay, copyright holders, and BitPay, Inc.\n" -#~ " cannot retrieve your private keys or passwords if you lose or " -#~ "forget them and cannot guarantee transaction\n" -#~ " confirmation as they do not have control over the Bitcoin network. " -#~ "You agree to provide accurate and complete\n" -#~ " information in connection with your use of the account. You assume " -#~ "any and all risk associated with the use of the\n" -#~ " software. To the fullest extent permitted by law, this software is " -#~ "provided “as is” and no representations or\n" -#~ " warranties can be made of any kind, express or implied, including " -#~ "but not limited to the warranties of\n" -#~ " merchantability, fitness or a particular purpose and " -#~ "noninfringement. In no event shall the authors of the software,\n" -#~ " employees and affiliates of Bitpay, copyright holders, or BitPay, " -#~ "Inc. be held liable for any claim, damages or other\n" -#~ " liability, whether in an action of contract, tort, or otherwise, " -#~ "arising from, out of or in connection with the\n" -#~ " software or the use or other dealings in the software. We reserve " -#~ "the right to modify this disclaimer from time to\n" -#~ " time." -#~ msgstr "" -#~ "El software que van a utilizar es libre de código abierto y software beta " -#~ "no admitido. Es importante entender que el software beta se refiere al " -#~ "software que es someterse a la prueba no ha sido lanzado oficialmente, " -#~ "puede tener errores y no puede actuar de una manera confiable. Porque el " -#~ "software está actualmente en fase beta, es posible pero no seguro de que " -#~ "puede perder bitcoin o el valor de tu bitcoin. Se recomienda que guarde " -#~ "sólo nominales cantidades de bitcoins. Usted reconoce que el uso de este " -#~ "software es bajo su propia discreción y cumple con todas las leyes " -#~ "aplicables. Usted es responsable de la custodia su ID de inicio de " -#~ "sesión, contraseñas, pares de claves privadas, pernos y cualquier otros " -#~ "códigos que utilizas para acceder al software. SI NO HAS ALMACENADO POR " -#~ "SEPARADO UNA COPIA DE SEGURIDAD DE CUALQUIER CARTERA DIRECCIONES Y PARES " -#~ "DE CLAVES PRIVADAS MANTENIDAS EN SU CUENTA, USTED RECONOCE Y ACEPTA QUE " -#~ "CUALQUIER BITCOINS SE HA ASOCIADO CON TALES DIRECCIONES CARTERA SERÁ " -#~ "INACCESIBLES SI NO TIENES TU CONTRASEÑA O PIN. Todas las solicitudes de " -#~ "transacción son irreversibles. Los autores del software, empleados y " -#~ "afiliados de Bitpay, los titulares del copyright y BitPay, Inc. no pueden " -#~ "recuperar sus claves o contraseñas si pierde u olvida y no garantiza la " -#~ "confirmación de la transacción como no tienen control sobre la red " -#~ "Bitcoin. Usted acepta proporcionar información precisa y completa en " -#~ "relación con su uso de la cuenta. Usted asume todo riesgo asociado con el " -#~ "uso del software. En la medida permitida por la ley, este software se " -#~ "proporciona \"tal cual\" y sin representaciones o garantías pueden ser " -#~ "hechas de cualquier tipo, expresas o implícitas, incluyendo pero no " -#~ "limitadas a, las garantías de comerciabilidad, idoneidad o un propósito " -#~ "particular y no infracción. En ningún caso los autores del software, " -#~ "empleados y afiliados de Bitpay, los titulares del copyright o BitPay, " -#~ "Inc. responderá de cualquier reclamación, daños u otra responsabilidad, " -#~ "ya sea en una acción de contrato, agravio o de lo contrario, que se " -#~ "presentaba de, fuera de o en relación con el software o el uso u otras " -#~ "reparticiones en el software. Nos reservamos el derecho de modificar este " -#~ "aviso de vez en cuando." - #~ msgid "The transaction proposal has been created" #~ msgstr "La propuesta de transacción fue creada" @@ -1880,9 +1947,6 @@ msgstr "" #~ "Crear y guardar una copia de seguridad le permitirá recuperar el dinero " #~ "de su monedero" -#~ msgid "Fee" -#~ msgstr "Tasa" - #~ 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 " @@ -1924,9 +1988,6 @@ msgstr "" #~ msgid "Ready" #~ msgstr "Listo" -#~ msgid "Send to" -#~ msgstr "Enviar a" - #~ msgid "Show all" #~ msgstr "Ver todo" @@ -2005,9 +2066,6 @@ msgstr "" #~ msgid "Your Password" #~ msgstr "Tu contraseña" -#~ msgid "Bitcoin Network" -#~ msgstr "Red Bitcoin" - #~ msgid "Download seed backup" #~ msgstr "Descargar copia de seguridad" diff --git a/po/template.pot b/po/template.pot index b915e0fec..e9e10874c 100644 --- a/po/template.pot +++ b/po/template.pot @@ -103,6 +103,10 @@ msgstr "" 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 "" @@ -334,6 +338,10 @@ msgstr "" msgid "ENTER" msgstr "" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "" + #: public/views/preferences.html msgid "Email Notifications" msgstr "" @@ -379,6 +387,10 @@ msgstr "" msgid "Family vacation funds" msgstr "" +#: 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" @@ -552,6 +564,10 @@ msgstr "" msgid "No transactions yet" msgstr "" +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "" + #: public/views/walletHome.html msgid "Not valid" msgstr "" @@ -690,6 +706,10 @@ msgstr "" msgid "Preferences" msgstr "" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "" + #: public/views/modals/scanner.html msgid "QR-Scanner" msgstr "" @@ -800,6 +820,10 @@ msgstr "" msgid "Send" msgstr "" +#: public/views/walletHome.html +msgid "Send All" +msgstr "" + #: public/views/backup.html #: public/views/preferencesLogs.html msgid "Send by email" @@ -1064,6 +1088,10 @@ msgstr "" msgid "Your wallet has been imported correctly" msgstr "" +#: public/views/preferencesFee.html +msgid "bits per kB" +msgstr "" + #: public/views/preferencesEmail.html msgid "email for wallet notifications" msgstr "" @@ -1090,6 +1118,10 @@ msgstr "" msgid "too long!" msgstr "" +#: src/js/controllers/walletHome.js +msgid "{{fee}} will be discounted for bitcoin networking fees" +msgstr "" + #: src/js/controllers/importLegacy.js msgid "{{len}} wallets imported. Funds scanning in progress. Hold on to see updated balance" msgstr "" diff --git a/public/views/preferences.html b/public/views/preferences.html index e9ffdbd7b..bcc4ac0c7 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -81,7 +81,7 @@ Bitcoin Network Fee Policy - {{preferences.feeName}} + {{preferences.feeName|translate}}

  • diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index fb4885cb6..de471845e 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -7,7 +7,7 @@
    - {{fee.name}} ({{fee.value}} bits per kB) + {{fee.name|translate}} ({{fee.value}} bits per kB)
    diff --git a/src/js/controllers/preferencesFee.js b/src/js/controllers/preferencesFee.js index 2ae1f6b88..cc8b825b6 100644 --- a/src/js/controllers/preferencesFee.js +++ b/src/js/controllers/preferencesFee.js @@ -1,17 +1,17 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesFeeController', - function($rootScope, $scope, configService, go) { + function($rootScope, $scope, configService, go, gettext) { var config = configService.getSync(); this.feeName = config.wallet.settings.feeName || 'Priority'; this.feeOpts = [{ - name: 'Priority', + name: gettext('Priority'), value: 100, }, { - name: 'Normal', + name: gettext('Normal'), value: 50, }, { - name: 'Economy', + name: gettext('Economy'), value: 10, }]; From ff4cb5c694e47e4bb50c0d6c7330fc5bcdbfed5a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 22 Jun 2015 17:15:54 -0300 Subject: [PATCH 172/250] Fixes TOS-es --- po/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 80d088e09..222f2ae94 100644 --- a/po/es.po +++ b/po/es.po @@ -1020,9 +1020,9 @@ msgstr "" "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 " +"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 " From 9ccfde4b1016874da364a5eb00908603e5c7eb2f Mon Sep 17 00:00:00 2001 From: Kirvx Date: Mon, 22 Jun 2015 23:02:49 +0200 Subject: [PATCH 173/250] Update fr.po --- po/fr.po | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4b1c35b53..8685097a6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13,8 +13,8 @@ msgstr "" "X-Generator: Poedit 1.6.10\n" #: public/views/modals/txp-details.html -msgid "* Only payment proposals created by yourself with no peer actions can be removed" -msgstr "Seules les propositions de transactions créées par vous-même avec aucune action de pairs peuvent être supprimées" +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." #: 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." @@ -111,6 +111,10 @@ msgstr "Options de sauvegarde" 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" + #: public/views/paymentUri.html msgid "Bitcoin URI is NOT valid!" msgstr "L'URI Bitcoin n'est pas valide !" @@ -342,6 +346,10 @@ msgstr "Télécharger la sauvegarde" msgid "ENTER" msgstr "ENTRER" +#: src/js/controllers/preferencesFee.js +msgid "Economy" +msgstr "Économique" + #: public/views/preferences.html msgid "Email Notifications" msgstr "Notifications e-mail" @@ -387,6 +395,10 @@ msgstr "Impossible d'importer les portefeuilles" msgid "Family vacation funds" msgstr "Fonds pour les vacances familiales" +#: public/views/modals/txp-details.html +msgid "Fee" +msgstr "Frais" + #. Get information of payment if using Payment Protocol #: src/js/controllers/walletHome.js msgid "Fetching Payment Information" @@ -557,6 +569,10 @@ msgstr "Non" msgid "No transactions yet" msgstr "Aucune transaction" +#: src/js/controllers/preferencesFee.js +msgid "Normal" +msgstr "Normale" + #: public/views/walletHome.html msgid "Not valid" msgstr "Non valide" @@ -695,6 +711,10 @@ msgstr "Portugais" msgid "Preferences" msgstr "Préférences" +#: src/js/controllers/preferencesFee.js +msgid "Priority" +msgstr "Prioritaire" + #: public/views/modals/scanner.html msgid "QR-Scanner" msgstr "QR-Scanner" @@ -805,6 +825,10 @@ msgstr "Sélectionnez le nombre total de copayers" msgid "Send" msgstr "Envoyer" +#: public/views/walletHome.html +msgid "Send All" +msgstr "Tout envoyer" + #: public/views/backup.html #: public/views/preferencesLogs.html msgid "Send by email" @@ -1069,6 +1093,10 @@ msgstr "Votre mot de passe de profil" msgid "Your wallet has been imported correctly" msgstr "Votre portefeuille a été correctement importé" +#: public/views/preferencesFee.html +msgid "bits per kB" +msgstr "bits par kB" + #: public/views/preferencesEmail.html msgid "email for wallet notifications" msgstr "e-mail pour les notifications de portefeuille" @@ -1095,6 +1123,10 @@ msgstr "paramètres" msgid "too long!" msgstr "trop long !" +#: 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" + #: 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" From 685275c4654234148081cfadcbab48f3dd05a71e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 23 Jun 2015 09:42:05 -0300 Subject: [PATCH 174/250] Fixes conjugation of verbs --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 222f2ae94..9fe3dd828 100644 --- a/po/es.po +++ b/po/es.po @@ -19,7 +19,7 @@ msgid "" "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) hayan transcurrido 24 horas desde la " +"ningún otro copayer la ha firmado, o 2) han transcurrido 24 horas desde la " "creación de la propuesta." #: public/views/backup.html From 599f53d39fa6e7eaba98288279ed96d419c2cdde Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 24 Jun 2015 17:55:08 -0300 Subject: [PATCH 175/250] Generate QR code with customized amount --- public/views/modals/customized-amount.html | 80 +++++++++++++++++++++ public/views/walletHome.html | 5 ++ src/js/controllers/walletHome.js | 81 ++++++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 public/views/modals/customized-amount.html diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html new file mode 100644 index 000000000..a83f5b59a --- /dev/null +++ b/public/views/modals/customized-amount.html @@ -0,0 +1,80 @@ + + + diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 5e298ed0f..8e724b825 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -264,6 +264,11 @@ +
    diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 635217a3d..7a8363ab6 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -411,6 +411,87 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } }; + this.openCustomizedAmountModal = function(addr) { + var self = this; + var fc = profileService.focusedClient; + var ModalInstanceCtrl = function($scope, $modalInstance) { + $scope.addr = addr; + $scope.color = fc.backgroundColor; + $scope.unitName = self.unitName; + $scope.alternativeAmount = self.alternativeAmount; + $scope.alternativeName = self.alternativeName; + $scope.alternativeIsoCode = self.alternativeIsoCode; + $scope.isRateAvailable = self.isRateAvailable; + $scope.unitToSatoshi = self.unitToSatoshi; + $scope.unitDecimals = self.unitDecimals; + var satToUnit = 1 / self.unitToSatoshi; + $scope.showAlternative = false; + + Object.defineProperty($scope, + "_customAlternative", { + get: function() { + return $scope.customAlternative; + }, + set: function(newValue) { + $scope.customAlternative = newValue; + if (typeof(newValue) === 'number' && $scope.isRateAvailable) { + $scope.customAmount = parseFloat((rateService.fromFiat(newValue, $scope.alternativeIsoCode) * satToUnit).toFixed($scope.unitDecimals), 10); + } + }, + enumerable: true, + configurable: true + }); + + Object.defineProperty($scope, + "_customAmount", { + get: function() { + return $scope.customAmount; + }, + set: function(newValue) { + $scope.customAmount = newValue; + if (typeof(newValue) === 'number' && $scope.isRateAvailable) { + $scope.customAlternative = parseFloat((rateService.toFiat(newValue * $scope.unitToSatoshi, $scope.alternativeIsoCode)).toFixed(2), 10); + } else { + $scope.customAlternative = 0; + } + $scope.alternativeAmount = $scope.customAlternative; + }, + enumerable: true, + configurable: true + }); + + $scope.submitForm = function(form) { + var satToBtc = 1 / 100000000; + var amount = form.amount.$modelValue; + var alternative = form.alternative.$modelValue; + if ($scope.unitName == 'bits') { + amount = parseInt((amount * $scope.unitToSatoshi).toFixed(0)) * satToBtc; + } + $scope.customizedAmount = amount; + $scope.customizedAlternative = alternative; + }; + + $scope.toggleAlternative = function() { + $scope.showAlternative = !$scope.showAlternative; + }; + + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + }; + + var modalInstance = $modal.open({ + templateUrl: 'views/modals/customized-amount.html', + windowClass: 'full animated slideInUp', + controller: ModalInstanceCtrl, + }); + + modalInstance.result.finally(function() { + var m = angular.element(document.getElementsByClassName('reveal-modal')); + m.addClass('slideOutDown'); + }); + }; + // Send this.canShowAlternative = function() { From 24244bdda468d239cb8266269b62c31a15b06f6c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 25 Jun 2015 12:26:43 -0300 Subject: [PATCH 176/250] Fixes reconnection and online events --- src/js/controllers/index.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 9d2501bb5..35c71a473 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -660,18 +660,18 @@ angular.module('copayApp.controllers').controller('indexController', function($r }); - // No need ot listing to Local/Resume since - // reconnection and Local/Online will be triggered - lodash.each(['Local/Online', 'Local/Resume'], function(eventName) { - $rootScope.$on(eventName, function(event) { - $log.debug('### ' + eventName + ' event'); - self.debouncedUpdate(); - }); + $rootScope.$on('Local/Resume', function(event) { + $log.debug('### Resume event'); + self.debouncedUpdate(); }); $rootScope.$on('Local/Online', function(event) { - self.isOffline = false; - self.offLineSince = null; + $log.debug('### Online event'); + if (self.isOffline) { + self.debouncedUpdate(); + self.isOffline = false; + self.offLineSince = null; + } }); self.offLineSince = null;; @@ -679,7 +679,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r $log.debug('### Offline event'); if (!self.offLineSince) self.offLineSince = Date.now(); - if (Date.now() - self.offLineSince > 10000) { + if (Date.now() - self.offLineSince > 30000) { self.isOffline = true; $timeout(function() { $rootScope.$apply(); From 6bcc7a43693451ea16cbf0ff619ee5be6e801b2e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 25 Jun 2015 15:37:39 -0300 Subject: [PATCH 177/250] Little fixes on reconnecting event --- 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 35c71a473..c63295144 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -667,10 +667,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/Online', function(event) { $log.debug('### Online event'); + self.isOffline = false; + self.offLineSince = null; if (self.isOffline) { self.debouncedUpdate(); - self.isOffline = false; - self.offLineSince = null; } }); From 81614618994ef977a1c66e70af4bb0bfd4a9d367 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 25 Jun 2015 15:53:01 -0300 Subject: [PATCH 178/250] wrong order --- src/js/controllers/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index c63295144..f6ec8aea5 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -667,11 +667,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r $rootScope.$on('Local/Online', function(event) { $log.debug('### Online event'); + if (self.isOffline) self.debouncedUpdate(); self.isOffline = false; self.offLineSince = null; - if (self.isOffline) { - self.debouncedUpdate(); - } }); self.offLineSince = null;; From 3b5235fcabbdc77953d73eb88ee9482587e1c17a Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 26 Jun 2015 05:22:55 -0300 Subject: [PATCH 179/250] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 02813bbe6..979233614 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,10 @@ Copay uses NW.js (also know as node-webkit) for its desktop version. NW.js an ap **Builder** - Run `grunt desktop` (*) + - + +## Using a custom hosted BWS and desktop version +See https://github.com/nwjs/nw.js/issues/679 for SSL self-signed certificate support in desktop apps. # Development From a2f2451ad9549243677eec762d30b486b8402a2a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 26 Jun 2015 11:09:35 -0300 Subject: [PATCH 180/250] Disabling unnecessary online/offline events for mobile/desktop --- src/js/init.js | 6 ------ src/js/services/profileService.js | 24 +++++++++++++----------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/js/init.js b/src/js/init.js index a0070e3f7..b8b84f84e 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -26,12 +26,6 @@ angular.element(document).ready(function() { }, 100); }, false); - // We are not emitting here, since when the BWS socket reconnects, - // update will be triggered - document.addEventListener('offline', function() { - window.location = '#/cordova/offline'; - }, false); - // Back button event document.addEventListener('backbutton', function() { var loc = window.location; diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index d237bf47a..2ebf60e7a 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) { + .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit) { var root = {}; @@ -62,18 +62,20 @@ angular.module('copayApp.services') client.removeAllListeners(); - client.on('reconnect', function() { - if (root.focusedClient.credentials.walletId == client.credentials.walletId) { - $rootScope.$emit('Local/Online'); - } - }); + if (!nodeWebkit.isDefined() && !isCordova) { + client.on('reconnect', function() { + if (root.focusedClient.credentials.walletId == client.credentials.walletId) { + $rootScope.$emit('Local/Online'); + } + }); - client.on('reconnecting', function() { - if (root.focusedClient.credentials.walletId == client.credentials.walletId) { - $rootScope.$emit('Local/Offline'); - } - }); + client.on('reconnecting', function() { + if (root.focusedClient.credentials.walletId == client.credentials.walletId) { + $rootScope.$emit('Local/Offline'); + } + }); + } client.on('notification', function(n) { $log.debug('BWC Notification:', n); From d02c1a7f118be0cdf455ccf48d05bb90e9d120a0 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 26 Jun 2015 11:55:41 -0300 Subject: [PATCH 181/250] Removes online/offline events --- src/js/controllers/index.js | 20 -------------------- src/js/controllers/walletHome.js | 14 -------------- src/js/routes.js | 3 --- src/js/services/profileService.js | 22 ++++++++++------------ 4 files changed, 10 insertions(+), 49 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index f6ec8aea5..a9605c1ba 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -665,26 +665,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.debouncedUpdate(); }); - $rootScope.$on('Local/Online', function(event) { - $log.debug('### Online event'); - if (self.isOffline) self.debouncedUpdate(); - self.isOffline = false; - self.offLineSince = null; - }); - - self.offLineSince = null;; - $rootScope.$on('Local/Offline', function(event) { - $log.debug('### Offline event'); - if (!self.offLineSince) self.offLineSince = Date.now(); - - if (Date.now() - self.offLineSince > 30000) { - self.isOffline = true; - $timeout(function() { - $rootScope.$apply(); - }); - } - }); - $rootScope.$on('Local/BackupDone', function(event) { self.needsBackup = false; storageService.setBackupFlag(self.walletId, function(err) { diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 635217a3d..0b25c47b4 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -46,18 +46,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.resetForm(); }); - var disableOnlineListener = $rootScope.$on('Local/Online', function() { - // This is needed then the apps go to sleep - self.bindTouchDown(); - }); - - var disableResumeListener = $rootScope.$on('Local/Resume', function() { - // This is needed then the apps go to sleep - self.bindTouchDown(); - }); - - - var disableTabListener = $rootScope.$on('Local/TabChanged', function(e, tab) { // This will slow down switch, do not add things here! switch (tab) { @@ -76,8 +64,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi disablePaymentUriListener(); disableTabListener(); disableFocusListener(); - disableResumeListener(); - disableOnlineListener(); $rootScope.hideMenuBar = false; }); diff --git a/src/js/routes.js b/src/js/routes.js index 14b74f7f2..90c5815d6 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -402,9 +402,6 @@ angular case 'resume': $rootScope.$emit('Local/Resume'); break; - case 'offline': - $rootScope.$emit('Local/Offline'); - break; }; $timeout(function() { $rootScope.$emit('Local/SetTab', 'walletHome', true); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 2ebf60e7a..5534c5555 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -62,20 +62,18 @@ angular.module('copayApp.services') client.removeAllListeners(); - if (!nodeWebkit.isDefined() && !isCordova) { - client.on('reconnect', function() { - if (root.focusedClient.credentials.walletId == client.credentials.walletId) { - $rootScope.$emit('Local/Online'); - } - }); + client.on('reconnect', function() { + if (root.focusedClient.credentials.walletId == client.credentials.walletId) { + $log.debug('### Online'); + } + }); - client.on('reconnecting', function() { - if (root.focusedClient.credentials.walletId == client.credentials.walletId) { - $rootScope.$emit('Local/Offline'); - } - }); - } + client.on('reconnecting', function() { + if (root.focusedClient.credentials.walletId == client.credentials.walletId) { + $log.debug('### Offline'); + } + }); client.on('notification', function(n) { $log.debug('BWC Notification:', n); From 678e3c8ac22806027be9c94e85c96354a971a150 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 26 Jun 2015 11:56:32 -0300 Subject: [PATCH 182/250] Tap to reconnect action should also to update history --- public/views/walletHome.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 5e298ed0f..5c402f4d1 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -74,7 +74,7 @@
    -
    +
    Could not update Wallet
    Tap to retry
    @@ -84,7 +84,7 @@
    Tap to retry
    -
    +
    {{index.totalBalanceStr}}
    From 0fc3aa9539842f495ac57df02633e5add49743d1 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 26 Jun 2015 14:25:53 -0300 Subject: [PATCH 183/250] Refactor customized amount --- public/views/modals/customized-amount.html | 12 ++++++------ src/js/controllers/walletHome.js | 15 +++++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/public/views/modals/customized-amount.html b/public/views/modals/customized-amount.html index a83f5b59a..5fbaad998 100644 --- a/public/views/modals/customized-amount.html +++ b/public/views/modals/customized-amount.html @@ -12,11 +12,11 @@