am dcd3a578: (-s ours) am d4d67815: (-s ours) Import translations. DO NOT MERGE

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