am fb15df09: (-s ours) am 0ec03af8: (-s ours) Import translations. DO NOT MERGE

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