Import translations. DO NOT MERGE
am: b23567e131  -s ours

* commit 'b23567e13193c82e18eac49189f56197d08353a4':
  Import translations. DO NOT MERGE