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

* commit 'a4f544540ebe27aca15305dd8f5bda5b5d10283b':
  Import translations. DO NOT MERGE