am cd281b79: (-s ours) am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE

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