Import French Submission @AndroidGX
Fix a merge issue for settings not yet available to the user
Merge pull request #337 from ThePlayground/master

Import French Submission @AndroidGX