am 4da36232: (-s ours) Import translations. DO NOT MERGE

* commit '4da36232a10a51b00d95631abeae1f347be2ee46':
  Import translations. DO NOT MERGE