am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE

* commit '82af5d893102dfb51257f2a4ff97c0c4c36fdd1a':
  Import translations. DO NOT MERGE