am 86538deb: (-s ours) am 325f3e0f: (-s ours) Import translations. DO NOT MERGE

* commit '86538debcdf7c59cf6e299c5c4c6ac1f883c2ed1':
  Import translations. DO NOT MERGE