Merge branch 'localization' into 'testing'

added localization

See merge request !28
1 job for testing in 1 second (queued for 3 seconds)