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

* commit '04d3709650e0ae1207d490c469277c8e8f1a09d0':
  Import translations. DO NOT MERGE