am e8bbcb1d: (-s ours) am 96c86af0: (-s ours) Import translations. DO NOT MERGE

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