am 58dbd5e7: (-s ours) Import translations. DO NOT MERGE

* commit '58dbd5e79fa768153f71ab4dccd2a33fa3466d2a':
  Import translations. DO NOT MERGE