am 7321aa8a: (-s ours) am 988482a1: am d80fd305: Import translations. DO NOT MERGE

* commit '7321aa8abf05541ee42aedc20f0fc103fe699124':
  Import translations. DO NOT MERGE