am cd2e610d: (-s ours) am 3b2c9f53: (-s ours) Import translations. DO NOT MERGE

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