am d078b84c: (-s ours) am 16ce4097: (-s ours) Import translations. DO NOT MERGE

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