am d2d82f31: (-s ours) am c407de23: (-s ours) Import translations. DO NOT MERGE

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