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

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