Merge pull request #2726 from ionux/master

Fix for typos, wording & minor formatting
This commit is contained in:
Matias Alejo Garcia 2015-05-14 15:24:16 -03:00
commit baeb3bfc69
9 changed files with 22 additions and 21 deletions

View File

@ -9,19 +9,19 @@ New features
* Smart backup restore procedure: now it is possible to restore all wallet's fund with an old backup (thanks Ian for the feedback).
* Transaction proposals can now have a short note attached for reference (thanks Gentry for the feedback).
* New wallet settings: Bitcoin Unit, defaults to *bits* (thanks Eric for the suggestion)
* Backup is now autogenerated on wallet completion (thanks Eric for the suggestion)
* Backup is now auto generated on wallet completion (thanks Eric for the suggestion)
* A wallet now can be removed from a particular system from the UX.
* New address book shared between copayers.
Security
--------
* Asymetric encryption and signing using ECIES. Details at https://gist.github.com/ryanxcharles/c29fc94d31de7c8c89dc
* Asymmetric encryption and signing using ECIES. Details at https://gist.github.com/ryanxcharles/c29fc94d31de7c8c89dc
* Default SSL connection to Insight and PeerJs servers
Code quality
------------
* Test coverage from 60.9% to 74% (1) (thanks Ryan for insisting on this)
* Mayor refactoring of Angular servicies (backupService, controllerUtils, wallet's Indexes handling, txProposal merge related functions,
* Mayor refactoring of Angular services (backupService, controllerUtils, wallet's Indexes handling, txProposal merge related functions,
* Add +30 karma tests for Angular controllers and services
* Unified js-beautifier format throw all the code
@ -42,3 +42,4 @@ Please check https://github.com/bitpay/copay/wiki/Copay-Known-issues before usin
(1) not including Karma tests, not included on Coveralls yet.

View File

@ -14,9 +14,9 @@ The application fails at login.
1) Launch the app `npm run start`
2) Click on "Join a Wallet"
3) Type an unexistent username
3) Type an nonexistent username
4) The app stops working, throws "Unhandled exception" error.
Expected: The app should login and show the home screen without any error.
Platform: Android 4.3, Android 4.4, iOS
Platform: Android 4.3, Android 4.4, iOS

View File

@ -6,7 +6,7 @@
*Copay* is an easy-to-use, open-source, multiplatform, multisignature, secure bitcoin wallet platform for both individuals and companies.
*Copay* uses Bitcore-Wallet-Service (https://github.com/bitpay/bitcore-wallet-service) for peer syncronization and bitcore network interfacing.
*Copay* uses Bitcore-Wallet-Service (https://github.com/bitpay/bitcore-wallet-service) for peer synchronization and bitcore network interfacing.
## Before you start
@ -54,7 +54,7 @@ Then visit localhost:3000 in your browser.
## Bitcore Wallet Service
Copay depends on Bitcore Wallet Service (BWS) for blockchain information, networking and copayer syncronization. BWS can be run within minutes or you can use a public instance. Switch between BWS instances is very simple and can be done with a click from Copay. BWS also allows Copay to interoperate with others wallet like Bitcore-Wallet CLI https://github.com/bitpay/bitcore-wallet
Copay depends on Bitcore Wallet Service (BWS) for blockchain information, networking and copayer synchronization. BWS can be run within minutes or you can use a public instance. Switch between BWS instances is very simple and can be done with a click from Copay. BWS also allows Copay to interoperate with others wallet like Bitcore-Wallet CLI https://github.com/bitpay/bitcore-wallet
## Tests
@ -109,7 +109,7 @@ On success, the chrome extension will be located at: `browser-extensions/chrome/
To install it go to `chrome://extensions/` in your Chrome browser and ensure you have the 'developer mode' option enabled in the settings. Then click on "Load unpacked chrome extension" and choose the directory mentioned above.
## Firefox Add-on
The *CoPay* Firefox Extension has been deprecated and is no longer supported.
The *Copay* Firefox Extension has been deprecated and is no longer supported.
# QA and Bug Reporting
@ -157,4 +157,4 @@ Copay uses the powerful and feature-rich [Bitcore](https://github.com/bitpay/bit
Copay currently supports [BIP70 (Payment Protocol)](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki), with the following limitations:
* Only one output is allowed. Payment requests that are more that one output are not supported.
* Only standard Pay-to-pubkeyhash and Pay-to-scripthash scripts are supported (on payment requests). Other script types will cause the entire payment request to be rejected.
* Memos from the custormer to the server are not supported (i.e. there is no place to write messages to the server in the current UX)
* Memos from the customer to the server are not supported (i.e. there is no place to write messages to the server in the current UX)

View File

@ -11,7 +11,7 @@
<div class="columns" ng-show="!backup.backupWalletPlainText && !backup.error">
<div class="text-warning size-14 m10v" ng-show="backup.isEncrypted">
<i class="fi-alert size-12"></i>
<span translate> This wallet have its private key encrypted. Exporting a backup will keep the private key encrypted on the backup.</span>
<span translate> The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive.</span>
</div>
@ -54,19 +54,19 @@
</div>
<div class="row m20b" ng-show="backup.backupWalletPlainText">
<div class="large-12 columns">
<h3 translate>Copy backup in a safe place</h3>
<h3 translate>Copy backup to a safe place</h3>
<div class="input">
<textarea rows="12">{{backup.backupWalletPlainText}}</textarea>
</div>
<div class="size-12 text-gray text-right">
<i class="icon-compose"></i>
<span translate>Copy this text as it is in a safe place (notepad or email)</span>
<span translate>Copy this text as it is to a safe place (notepad or email)</span>
</div>
</div>
</div>
<div class="m10 size-14 text-gray" translate>
* 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.
</div>
</div>

View File

@ -55,7 +55,7 @@
</label>
</div>
<div class="large-6 medium-6 columns">
<label><span translate>Select required signatures</span>
<label><span translate>Select required number of signatures</span>
<select class="m10t" ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in create.RCValues" ng-disabled="totalCopayers == 1">
</select>
</label>
@ -67,7 +67,7 @@
<i class="fi-widget m3r"></i>
<span translate ng-hide="!hideAdv">Show</span>
<span translate ng-hide="hideAdv">Hide</span>
<span translate>advanced options</span>
<span translate>Advanced options</span>
<i ng-if="hideAdv" class="icon-arrow-down4"></i>
<i ng-if="!hideAdv" class="icon-arrow-up4"></i>
</a>

View File

@ -30,7 +30,7 @@
<div ng-show="!import.isSafari && !import.isCordova" class="line-b m10b">
<label for="backupFile">
<span translate>Choose backup file from your computer</span> <i class="fi-laptop"></i>
<span translate>Choose a backup file from your computer</span> <i class="fi-laptop"></i>
</label>
<input type="file" class="form-control" placeholder="{{'Select a backup file'|translate}}"
name="backupFile" ng-model="import.backupFile" ng-file-select>
@ -38,7 +38,7 @@
<div ng-show="import.isSafari || import.isCordova">
<label for="backupText">
<span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i>
<span translate>Paste the backup plain text code</span> <i class="fi-clipboard"></i>
</label>
<textarea class="form-control" name="backupText" ng-model="import.backupText" rows="5"></textarea>
</div>

View File

@ -68,7 +68,7 @@
<i class="fi-widget m3r"></i>
<span translate ng-show="!join.hideAdv">Show</span>
<span translate ng-show="join.hideAdv">Hide</span>
<span translate>advanced options</span>
<span translate>Advanced options</span>
<i ng-show="!join.hideAdv" class="icon-arrow-down4"></i>
<i ng-show="join.hideAdv" class="icon-arrow-up4"></i>
</a>

View File

@ -5,7 +5,7 @@
</div>
<h1 translate class="text-center">Browser unsupported</h1>
<h3 class="text-center">
Copay does not support your browser.
Sorry, Copay is not supported by your browser.
Please use a current version of Google Chrome, Mozilla Firefox, Internet Explorer, Safari, or Opera.
<br>
Note that localStorage should also be enabled (enabled by default in most cases).

View File

@ -7,7 +7,7 @@
<div ng-controller="walletHomeController as home">
<div class="row columns m20tp" ng-show="index.noFocusedWallet">
<div class="text-center text-warning m20b">
<i class="fi-alert"></i> <span translate>You do not have any wallet</span>
<i class="fi-alert"></i> <span translate>You do not have a wallet</span>
</div>
<button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
@ -243,7 +243,7 @@
</span>
</div>
<div class="line-t size-12" translate>
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.
</div>
</div>
</div>