am 897eeeb7: (-s ours) am 3082585c: (-s ours) Import translations. DO NOT MERGE

* commit '897eeeb7a0e348ca3d69b91d01fc4a5da72cf6ac':
  Import translations. DO NOT MERGE