am 84f3b176: (-s ours) am 46fc16f2: (-s ours) am 6ac23953: (-s ours) Import translations. DO NOT MERGE

* commit '84f3b176beb0a281ca837662e59e9c0fe94c563e':
  Import translations. DO NOT MERGE