am 08bbd784: (-s ours) am 9f9380df: (-s ours) Import translations. DO NOT MERGE

* commit '08bbd78468ffd2b930d0cdbca284cbabf6e9405a':
  Import translations. DO NOT MERGE