am 97408b93: (-s ours) am e7c8f32f: (-s ours) Import translations. DO NOT MERGE

* commit '97408b93fdb647326288b4d42608abfdd300deda':
  Import translations. DO NOT MERGE