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

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