Import translations. DO NOT MERGE am: de4b81f  -s ours
am: df21817  -s ours

* commit 'df218175830854aaaf4c8c6d3ee58fd2016672b6':