am 2f4d45ac: (-s ours) am 97f1c107: (-s ours) Import translations. DO NOT MERGE

* commit '2f4d45ace03b4cd7c08e181dae0d6759be666dc1':
  Import translations. DO NOT MERGE