am bd1117ea: (-s ours) am 63215b6c: (-s ours) am 946371f8: (-s ours) Import translations. DO NOT MERGE

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