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

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