Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement fingerprint login method #244

Merged
merged 15 commits into from
Apr 24, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into feature/fingerprint
  • Loading branch information
0140454 committed Apr 23, 2018
commit ec83c311a56013b929270d29238493b59ff53619
4 changes: 2 additions & 2 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
who can get your fingerprint will have full access to your funds.\n\nFor example, a malicious
user around you can unlock your wallet when you are asleep.\n\nAre you sure to enable this function?
]</string>
<string name="generate_bad_passwordB">[Passphrases do not match]</string>
<string name="generate_empty_passwordB">[Passphrase may not be empty]</string>
<string name="generate_bad_passwordB">Contraseñas no coinciden</string>
<string name="generate_empty_passwordB">Contraseña no puede estar vacía</string>
<string name="generate_buttonGenerate">¡Házme ya un monedero!</string>
<string name="generate_seed">Semilla Mnemotécnica</string>
<string name="generate_button_accept">¡Ya anote todo!</string>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.