am ecf78498: (-s ours) Import translations. DO NOT MERGE

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