updated translation
Merge branch 'master' into tizen2
Began gps location