Update strings.

Update strings.
Fix encrypt wallet (ok button)
Merge branch 'master' of https://github.com/raizor/CGB