am 8a6c6846: (-s ours) am d82d890e: (-s ours) Import translations. DO NOT MERGE

* commit '8a6c68461821c6c3e6a08ec07e08345fdfb1b591':
  Import translations. DO NOT MERGE