am 38e5f9b4: (-s ours) am f242aee4: (-s ours) Import translations. DO NOT MERGE

* commit '38e5f9b4c5d9dc4d2421ef569988e0f960d3e1a0':
  Import translations. DO NOT MERGE