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

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