am 7dbd712d: (-s ours) am 2f84efb3: (-s ours) Import translations. DO NOT MERGE

* commit '7dbd712de80e86182f3c16849540773177451748':
  Import translations. DO NOT MERGE