Merge pull request #1206 from mfleisz/master

iOS: Fix for shift key handling (by bslande)
Android: Added missing french translation