am 98cbf13a: (-s ours) am b3ee8610: (-s ours) Import translations. DO NOT MERGE

* commit '98cbf13a339be6dadd8e8968f5b1917a28786f83':
  Import translations. DO NOT MERGE