am 51bb294b: (-s ours) am 0cfbd5b2: (-s ours) Import translations. DO NOT MERGE

* commit '51bb294b67ae0d4c2ab59aa3f2e463518f6b6bc7':
  Import translations. DO NOT MERGE