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

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