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

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