am f3154ed9: (-s ours) am 378ba42a: (-s ours) am dfe2ed8f: (-s ours) Import translations. DO NOT MERGE

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