Merge branch 'bbidulock-master'
Update po files.