Import translations. DO NOT MERGE am: b4c3034  -s ours
am: d06da28  -s ours

* commit 'd06da28660af26edc9d10610251e6a1afc9ae902':