Localization fixes
Merge remote-tracking branch 'origin/feature/trip_creating' into feature/trip_creating