Update strings.xml
update transaltions
Merge branch 'dev'
Merge branch 'dev' into androdi-l-dev