am a467ef27: (-s ours) am 7c3b54a5: (-s ours) Import translations. DO NOT MERGE

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