am eb95b708: (-s ours) am 7e09c536: (-s ours) Import translations. DO NOT MERGE

* commit 'eb95b708177798ed6448e831ae66b70babb4c41c':
  Import translations. DO NOT MERGE