More Localization

Did more localization for new strings and edited old localization code
to be more consistent.
Merge pull request #1 from gregory-diaz/my-branch

More Localization