Merge branch 'master' into v1.6

This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-08 12:51:39 -03:00
commit 9443d1d17b
2 changed files with 19 additions and 19 deletions

View file

@ -55,7 +55,7 @@
<div >
<label for="words">
<span translate>Type the Seed Word (usually 12 words)</span>:
<span translate>Type the Seed Phrase (usually 12 words)</span>:
</label>
<textarea class="form-control" name="words" ng-model="import.words" rows="2" autocapitalize="off" spellcheck="false"></textarea>
</div>