am d29accc6: (-s ours) am 9cd4e67e: Import translations. DO NOT MERGE

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